Changeset 50041 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/unpacker

Timestamp:

Jan 9, 2014 4:13:28 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91522

Message:

crOpenGL: crOpenGL: 1. workaround point sprite driver bugs; 2. workaround multi-string shader source driver bug; 3. proper GLhandle for OSX; 4. extended dumping; 5. misc fixes

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c

@@ -40 +40 @@
     GLint hasNonLocalLen = READ_DATA(16, GLsizei);
     GLint *pLocalLength = DATA_POINTER(20, GLint);
-    const char **ppStrings = NULL;
-    GLsizei i;
+    char **ppStrings = NULL;
+    GLsizei i, j, jUpTo;
     int pos=20+count*sizeof(*pLocalLength);
 
@@ -61 +61 @@
             pLocalLength[i] -= 1;
         }
+
+        Assert(pLocalLength[i] > 0);
+        jUpTo = i == count -1 ? pLocalLength[i] - 1 : pLocalLength[i];
+        for (j = 0; j < jUpTo; ++j)
+        {
+            char *pString = ppStrings[i];
+
+            if (pString[j] == '\0')
+            {
+                Assert(j == jUpTo - 1);
+                pString[j] = '\n';
+            }
+        }
     }
 
-    cr_unpackDispatch.ShaderSource(shader, count, ppStrings, length ? length : pLocalLength);
+//    cr_unpackDispatch.ShaderSource(shader, count, ppStrings, length ? length : pLocalLength);
+    cr_unpackDispatch.ShaderSource(shader, 1, ppStrings, 0);
+
     crFree(ppStrings);
 }
@@ -250 +265 @@
 void crUnpackExtendGetAttachedObjectsARB(void)
 {
-        GLhandleARB containerObj = READ_DATA(8, GLhandleARB);
+        VBoxGLhandleARB containerObj = READ_DATA(8, VBoxGLhandleARB);
         GLsizei maxCount = READ_DATA(12, GLsizei);
         SET_RETURN_PTR(16);
@@ -259 +274 @@
 void crUnpackExtendGetInfoLogARB(void)
 {
-        GLhandleARB obj = READ_DATA(8, GLhandleARB);
+        VBoxGLhandleARB obj = READ_DATA(8, VBoxGLhandleARB);
         GLsizei maxLength = READ_DATA(12, GLsizei);
         SET_RETURN_PTR(16);