Changeset 43901 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Nov 16, 2012 5:28:53 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: set shader source fix

File:

• trunk/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c

@@ -53 +53 @@
     for (i=0; i<count; ++i)
     {
-        pLocalLength[i] = (length && (length[i]>=0)) ? length[i] : crStrlen(string[i])+1;
+        pLocalLength[i] = ((length && (length[i]>=0)) ? length[i] : crStrlen(string[i]))+1;
         packet_length += pLocalLength[i];
     }
@@ -81 +81 @@
         if (string[i])
         {
-            crMemcpy(data_ptr, string[i], pLocalLength[i]);
+            if (length && (length[i]>=0))
+            {
+                /* include \0 in the string to make intel drivers happy */
+                crMemcpy(data_ptr, string[i], pLocalLength[i] - 1);
+                data_ptr[pLocalLength[i] - 1] = '\0';
+            }
+            else
+            {
+                /* the \0 s already in the string */
+                crMemcpy(data_ptr, string[i], pLocalLength[i]);
+            }
         }
         else