Changeset 20437 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: fix various opengl 2.0 get functions

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/Makefile.kmk (modified) (1 diff)
• Additions/common/crOpenGL/pack/packspu_getshaders.c (added)
• Additions/common/crOpenGL/pack/packspu_special (modified) (1 diff)
• GuestHost/OpenGL/packer/pack_shaders.c (modified) (2 diffs)
• GuestHost/OpenGL/packer/packer_special (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_getshaders.c (modified) (1 diff)
• HostServices/SharedOpenGL/unpacker/unpack_shaders.c (modified) (1 diff)
• HostServices/SharedOpenGL/unpacker/unpacker_special (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -374 +374 @@
         pack/packspu_pixel.c \
         pack/packspu_texture.c \
+    pack/packspu_getshaders.c \
         $(VBOX_PATH_CROGL_GENFILES)/packspu.c \
         $(VBOX_PATH_CROGL_GENFILES)/packspu_get.c \

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_special

@@ -64 +64 @@
 DrawBuffer
 Flush
+GetActiveAttrib
+GetActiveUniform
+GetAttachedShaders
+GetShaderInfoLog
+GetProgramInfoLog
+GetShaderSource

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

@@ -263 +263 @@
 }
 
+/*@todo next 5 functions are bit hacky, 
+ * we expect packspu to pass a single structure with all output parameters via first output pointer.
+ * it'd be better to add CRMessageMultiReadback one day.
+ */
+void PACK_APIENTRY crPackGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, char * name, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    (void) pc;
+    (void) size;
+    (void) type;
+    (void) name;
+    GET_BUFFERED_POINTER(pc, 36);
+    WRITE_DATA(0, GLint, 36);
+    WRITE_DATA(4, GLenum, CR_GETACTIVEATTRIB_EXTEND_OPCODE);
+    WRITE_DATA(8, GLuint, program);
+    WRITE_DATA(12, GLuint, index);
+    WRITE_DATA(16, GLsizei, bufSize);
+    WRITE_NETWORK_POINTER(20, (void *) length);
+    WRITE_NETWORK_POINTER(28, (void *) writeback);
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
+void PACK_APIENTRY crPackGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, char * name, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    (void) pc;
+    (void) size;
+    (void) type;
+    (void) name;
+    GET_BUFFERED_POINTER(pc, 36);
+    WRITE_DATA(0, GLint, 36);
+    WRITE_DATA(4, GLenum, CR_GETACTIVEUNIFORM_EXTEND_OPCODE);
+    WRITE_DATA(8, GLuint, program);
+    WRITE_DATA(12, GLuint, index);
+    WRITE_DATA(16, GLsizei, bufSize);
+    WRITE_NETWORK_POINTER(20, (void *) length);
+    WRITE_NETWORK_POINTER(28, (void *) writeback);
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
+void PACK_APIENTRY crPackGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei * count, GLuint * shaders, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    (void) pc;
+    (void) shaders;
+    GET_BUFFERED_POINTER(pc, 32);
+    WRITE_DATA(0, GLint, 32);
+    WRITE_DATA(4, GLenum, CR_GETATTACHEDSHADERS_EXTEND_OPCODE);
+    WRITE_DATA(8, GLuint, program);
+    WRITE_DATA(12, GLsizei, maxCount);
+    WRITE_NETWORK_POINTER(16, (void *) count);
+    WRITE_NETWORK_POINTER(24, (void *) writeback);
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
+void PACK_APIENTRY crPackGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei * length, char * infoLog, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    (void) pc;
+    (void) infoLog;
+    GET_BUFFERED_POINTER(pc, 32);
+    WRITE_DATA(0, GLint, 32);
+    WRITE_DATA(4, GLenum, CR_GETPROGRAMINFOLOG_EXTEND_OPCODE);
+    WRITE_DATA(8, GLuint, program);
+    WRITE_DATA(12, GLsizei, bufSize);
+    WRITE_NETWORK_POINTER(16, (void *) length);
+    WRITE_NETWORK_POINTER(24, (void *) writeback);
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
+void PACK_APIENTRY crPackGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei * length, char * infoLog, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    (void) pc;
+    (void) infoLog;
+    GET_BUFFERED_POINTER(pc, 32);
+    WRITE_DATA(0, GLint, 32);
+    WRITE_DATA(4, GLenum, CR_GETSHADERINFOLOG_EXTEND_OPCODE);
+    WRITE_DATA(8, GLuint, shader);
+    WRITE_DATA(12, GLsizei, bufSize);
+    WRITE_NETWORK_POINTER(16, (void *) length);
+    WRITE_NETWORK_POINTER(24, (void *) writeback);
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
+void PACK_APIENTRY crPackGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei * length, char * source, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    (void) pc;
+    (void) source;
+    GET_BUFFERED_POINTER(pc, 32);
+    WRITE_DATA(0, GLint, 32);
+    WRITE_DATA(4, GLenum, CR_GETSHADERSOURCE_EXTEND_OPCODE);
+    WRITE_DATA(8, GLuint, shader);
+    WRITE_DATA(12, GLsizei, bufSize);
+    WRITE_NETWORK_POINTER(16, (void *) length);
+    WRITE_NETWORK_POINTER(24, (void *) writeback);
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
+void PACK_APIENTRY crPackGetAttribLocation(GLuint program, const char * name, GLint * return_value, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    int cbName = crStrlen(name)+1;
+    int packet_length = sizeof(int)+sizeof(GLenum)+sizeof(program)+cbName*sizeof(*name)+16;
+
+    GET_BUFFERED_POINTER(pc, packet_length);
+    WRITE_DATA_AI(int, packet_length);
+    WRITE_DATA_AI(GLenum, CR_GETATTRIBLOCATION_EXTEND_OPCODE);
+    WRITE_DATA_AI(GLuint, program);
+    crMemcpy(data_ptr, name, cbName*sizeof(*name));
+    data_ptr +=  cbName*sizeof(*name);
+    WRITE_NETWORK_POINTER(0, (void *) return_value );
+    WRITE_NETWORK_POINTER(8, (void *) writeback );
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
+void PACK_APIENTRY crPackGetUniformLocation( GLuint program, const char * name, GLint * return_value, int * writeback )
+{
+    GET_PACKER_CONTEXT(pc);
+    unsigned char *data_ptr;
+    int cbName = crStrlen(name)+1;
+    int packet_length = sizeof(int)+sizeof(GLenum)+sizeof(program)+cbName*sizeof(*name)+16;
+
+    GET_BUFFERED_POINTER(pc, packet_length);
+    WRITE_DATA_AI(int, packet_length);
+    WRITE_DATA_AI(GLenum, CR_GETUNIFORMLOCATION_EXTEND_OPCODE);
+    WRITE_DATA_AI(GLuint, program);
+    crMemcpy(data_ptr, name, cbName*sizeof(*name));
+    data_ptr +=  cbName*sizeof(*name);
+    WRITE_NETWORK_POINTER(0, (void *) return_value );
+    WRITE_NETWORK_POINTER(8, (void *) writeback );
+    WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+}
+
 void PACK_APIENTRY crPackBindAttribLocationSWAP(GLuint program, GLuint index, const char *name)
 {
@@ -406 +548 @@
     (void) pc;
 }
+
+void PACK_APIENTRY crPackGetAttribLocationSWAP(GLuint program, const char * name, GLint * return_value, int * writeback)
+{
+    GET_PACKER_CONTEXT(pc);
+    (void)program;
+    (void)name;
+    (void)return_value;
+    (void)writeback;
+    crError ("No swap version");
+    (void) pc;
+}
+
+void PACK_APIENTRY crPackGetUniformLocationSWAP( GLuint program, const char * name, GLint * return_value, int * writeback )
+{
+    GET_PACKER_CONTEXT(pc);
+    (void)program;
+    (void)name;
+    (void)return_value;
+    (void)writeback;
+    crError ("No swap version");
+    (void) pc;
+}

trunk/src/VBox/GuestHost/OpenGL/packer/packer_special

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

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