Changeset 51200 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

May 6, 2014 5:21:16 PM (11 years ago)

Author:

vboxsync

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

93582

Message:

crOpenGL: getAttribLocations

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_config.c (modified) (4 diffs)
• crserverlib/server_getshaders.c (modified) (1 diff)
• crserverlib/server_special (modified) (1 diff)
• unpacker/unpack_shaders.c (modified) (1 diff)
• unpacker/unpacker_special (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

@@ -226 +226 @@
     {
         cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
-        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_CMDVBVA | CR_VBOX_CAP_CMDBLOCKS);
+        cr_server.u32Caps &= CR_VBOX_CAPS_ALL;
     }
     else
@@ -233 +233 @@
                 | CR_VBOX_CAP_CMDVBVA
                 | CR_VBOX_CAP_CMDBLOCKS
+#ifdef DEBUG_misha
+                | CR_VBOX_CAP_GETATTRIBSLOCATIONS
+#endif
                 ;
 
@@ -376 +379 @@
     {
         cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
-        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_CMDVBVA | CR_VBOX_CAP_CMDBLOCKS);
+        cr_server.u32Caps &= CR_VBOX_CAPS_ALL;
     }
     else
@@ -383 +386 @@
                 | CR_VBOX_CAP_CMDVBVA
                 | CR_VBOX_CAP_CMDBLOCKS
+#ifdef DEBUG_misha
+                | CR_VBOX_CAP_GETATTRIBSLOCATIONS
+#endif
                 ;
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c

@@ -224 +224 @@
 }
 
+void SERVER_DISPATCH_APIENTRY
+crServerDispatchGetAttribsLocations(GLuint program, GLsizei maxcbData, GLsizei * cbData, GLvoid * pData)
+{
+    GLsizei *pLocal;
+
+    (void) cbData;
+    (void) pData;
+
+    pLocal = (GLsizei*) crAlloc(maxcbData+sizeof(GLsizei));
+    if (!pLocal)
+    {
+        GLsizei zero=0;
+        crServerReturnValue(&zero, sizeof(zero));
+    }
+
+    /* initial (fallback )value */
+    *pLocal = 0;
+    crStateGLSLProgramCacheAttribs(program, maxcbData, pLocal, (char*)&pLocal[1]);
+
+    crServerReturnValue(pLocal, (*pLocal)+sizeof(GLsizei));
+    crFree(pLocal);
+}
+
 static GLint __GetUniformSize(GLuint program, GLint location)
 {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_special

@@ -221 +221 @@
 DeleteObjectARB
 GetUniformsLocations
+GetAttribsLocations
 GetPolygonStipple
 Flush

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

@@ -336 +336 @@
         cr_unpackDispatch.GetUniformsLocations(program, maxcbData, NULL, NULL);
 }
+
+void crUnpackExtendGetAttribsLocations(void)
+{
+    GLuint program = READ_DATA(8, GLuint);
+    GLsizei maxcbData = READ_DATA(12, GLsizei);
+    SET_RETURN_PTR(16);
+    SET_WRITEBACK_PTR(24);
+    cr_unpackDispatch.GetAttribsLocations(program, maxcbData, NULL, NULL);
+}

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpacker_special

@@ -169 +169 @@
 UnlockArraysEXT
 GetUniformsLocations
+GetAttribsLocations
 GetTexImage
 GetCompressedTexImageARB