Changeset 50041 in vbox for trunk/src/VBox/GuestHost/OpenGL/packer

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/GuestHost/OpenGL/packer/pack_extensions.c (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/packer/pack_shaders.c (modified) (4 diffs)

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

@@ -6 +6 @@
 
 #include "packer.h"
-
-#include <GL/glext.h>
 
 int __packTexParameterNumParams( GLenum param )

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

@@ -469 +469 @@
 }
 
-void PACK_APIENTRY crPackGetAttachedObjectsARB(GLhandleARB containerObj, GLsizei maxCount, GLsizei * count, GLhandleARB * obj, int * writeback)
+void PACK_APIENTRY crPackGetAttachedObjectsARB(VBoxGLhandleARB containerObj, GLsizei maxCount, GLsizei * count, VBoxGLhandleARB * obj, int * writeback)
 {
         CR_GET_PACKER_CONTEXT(pc);
@@ -477 +477 @@
         WRITE_DATA(0, GLint, 32);
         WRITE_DATA(4, GLenum, CR_GETATTACHEDOBJECTSARB_EXTEND_OPCODE);
-        WRITE_DATA(8, GLhandleARB, containerObj);
+        WRITE_DATA(8, VBoxGLhandleARB, containerObj);
         WRITE_DATA(12, GLsizei, maxCount);
         WRITE_NETWORK_POINTER(16, (void *) count);
@@ -485 +485 @@
 }
 
-void PACK_APIENTRY crPackGetInfoLogARB(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog, int * writeback)
+void PACK_APIENTRY crPackGetInfoLogARB(VBoxGLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog, int * writeback)
 {
         CR_GET_PACKER_CONTEXT(pc);
@@ -493 +493 @@
         WRITE_DATA(0, GLint, 32);
         WRITE_DATA(4, GLenum, CR_GETINFOLOGARB_EXTEND_OPCODE);
-        WRITE_DATA(8, GLhandleARB, obj);
+        WRITE_DATA(8, VBoxGLhandleARB, obj);
         WRITE_DATA(12, GLsizei, maxLength);
         WRITE_NETWORK_POINTER(16, (void *) length);