Changeset 82722 in vbox

Timestamp:

Jan 12, 2020 9:02:01 PM (5 years ago)

Author:

vboxsync

Message:

3D: Corrected r135648 to fix blank guest screen, bugref:9613

Location:

trunk/src/VBox/Devices/Graphics/shaderlib

Files:

• shader_sm1.c (modified) (5 diffs)
• shader_sm4.c (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/shaderlib/shader_sm1.c

@@ -214 +214 @@
     struct wined3d_shader_version shader_version;
     const DWORD *end;
+    DWORD tokens_num;
     const struct wined3d_sm1_opcode_info *opcode_table;
 };
@@ -539 +540 @@
     }
     
-    priv->end = byte_code + tokens_num;
+    priv->end = NULL;
+    priv->tokens_num = tokens_num;
 
     if (output_signature)
@@ -576 +578 @@
     struct wined3d_sm1_data *priv = data;
     DWORD version_token;
+
+    priv->end = *ptr + priv->tokens_num;
 
     version_token = *(*ptr)++;
@@ -679 +683 @@
     struct wined3d_sm1_data *priv = data;
 
-    if (*ptr >= priv->end)
-    {
-        return TRUE;
-    }
-
     if (**ptr == WINED3DSP_END)
     {
@@ -689 +688 @@
         return TRUE;
     }
+
+    AssertMsgReturn(*ptr < priv->end, ("End-of-bytecode token is missing"), TRUE);
 
     return FALSE;

trunk/src/VBox/Devices/Graphics/shaderlib/shader_sm4.c

@@ -101 +101 @@
     struct wined3d_shader_version shader_version;
     const DWORD *end;
+    DWORD tokens_num;
     const struct wined3d_shader_signature *output_signature;
 };
@@ -238 +239 @@
     }
 
-    priv->end = byte_code + tokens_num;
+    priv->end = NULL;
+    priv->tokens_num = tokens_num;
     priv->output_signature = output_signature;