Changeset 20437 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jun 9, 2009 1:06:48 PM (16 years ago)

Author:

vboxsync

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

48386

Message:

crOpenGL: fix various opengl 2.0 get functions

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_getshaders.c (modified) (1 diff)
• unpacker/unpack_shaders.c (modified) (1 diff)
• unpacker/unpacker_special (modified) (1 diff)

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

@@ -29 +29 @@
 } crGetActive_t;
 
-/*@todo: most of those functions would fail. Either need to support more than 1 cr_server.return_ptr(s) or 
- *       change pack_spu to pack output args into single buffer.
- */
-
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, char *name)
 {

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

@@ -159 +159 @@
     cr_unpackDispatch.DrawBuffers(n, bufs);
 }
+
+void crUnpackExtendGetActiveAttrib(void)
+{
+    GLuint program = READ_DATA(8, GLuint);
+    GLuint index = READ_DATA(12, GLuint);
+    GLsizei bufSize = READ_DATA(16, GLsizei);
+    SET_RETURN_PTR(20);
+    SET_WRITEBACK_PTR(28);
+    cr_unpackDispatch.GetActiveAttrib(program, index, bufSize, NULL, NULL, NULL, NULL);
+}
+
+void crUnpackExtendGetActiveUniform(void)
+{
+    GLuint program = READ_DATA(8, GLuint);
+    GLuint index = READ_DATA(12, GLuint);
+    GLsizei bufSize = READ_DATA(16, GLsizei);
+    SET_RETURN_PTR(20);
+    SET_WRITEBACK_PTR(28);
+    cr_unpackDispatch.GetActiveUniform(program, index, bufSize, NULL, NULL, NULL, NULL);
+}
+
+void crUnpackExtendGetAttachedShaders(void)
+{
+    GLuint program = READ_DATA(8, GLuint);
+    GLsizei maxCount = READ_DATA(12, GLsizei);
+    SET_RETURN_PTR(16);
+    SET_WRITEBACK_PTR(24);
+    cr_unpackDispatch.GetAttachedShaders(program, maxCount, NULL, NULL);
+}
+
+void crUnpackExtendGetProgramInfoLog(void)
+{
+    GLuint program = READ_DATA(8, GLuint);
+    GLsizei bufSize = READ_DATA(12, GLsizei);
+    SET_RETURN_PTR(16);
+    SET_WRITEBACK_PTR(24);
+    cr_unpackDispatch.GetProgramInfoLog(program, bufSize, NULL, NULL);
+}
+
+void crUnpackExtendGetShaderInfoLog(void)
+{
+    GLuint shader = READ_DATA(8, GLuint);
+    GLsizei bufSize = READ_DATA(12, GLsizei);
+    SET_RETURN_PTR(16);
+    SET_WRITEBACK_PTR(24);
+    cr_unpackDispatch.GetShaderInfoLog(shader, bufSize, NULL, NULL);
+}
+
+void crUnpackExtendGetShaderSource(void)
+{
+    GLuint shader = READ_DATA(8, GLuint);
+    GLsizei bufSize = READ_DATA(12, GLsizei);
+    SET_RETURN_PTR(16);
+    SET_WRITEBACK_PTR(24);
+    cr_unpackDispatch.GetShaderSource(shader, bufSize, NULL, NULL);
+}
+
+void crUnpackExtendGetAttribLocation(void)
+{
+    int packet_length = READ_DATA(0, int);
+    GLuint program = READ_DATA(8, GLuint);
+    const char *name = DATA_POINTER(12, const char);
+    SET_RETURN_PTR(packet_length-16);
+    SET_WRITEBACK_PTR(packet_length-8);
+    cr_unpackDispatch.GetAttribLocation(program, name);
+}
+
+void crUnpackExtendGetUniformLocation(void)
+{
+    int packet_length = READ_DATA(0, int);
+    GLuint program = READ_DATA(8, GLuint);
+    const char *name = DATA_POINTER(12, const char);
+    SET_RETURN_PTR(packet_length-16);
+    SET_WRITEBACK_PTR(packet_length-8);
+    cr_unpackDispatch.GetUniformLocation(program, name);
+}

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

@@ -153 +153 @@
 UniformMatrix4fv
 DrawBuffers
+GetActiveAttrib
+GetActiveUniform
+GetAttachedShaders
+GetShaderInfoLog
+GetProgramInfoLog
+GetShaderSource
+GetAttribLocation
+GetUniformLocation