Changeset 50041 in vbox for trunk/src/VBox/Additions/common/crOpenGL/pack

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/Additions/common/crOpenGL/pack/packspu_get.py (modified) (2 diffs)
• src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c (modified) (4 diffs)
• src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py

@@ -49 +49 @@
 
 from get_sizes import *
-from get_components import *
 
 easy_swaps = { 
@@ -206 +205 @@
             print '\tif (pack_spu.swap)'
             print '\t{'
-            print '\t\tfor (i = 0 ; i < lookupComponents(pname) ; i++)'
+            print '\t\tfor (i = 0 ; i < crStateHlpComponentsCount(pname) ; i++)'
             print '\t\t{'
             if hard_funcs[func_name] == 'SWAPDOUBLE':

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c

@@ -99 +99 @@
 }
 
-void PACKSPU_APIENTRY packspu_GetAttachedObjectsARB(GLhandleARB containerObj, GLsizei maxCount, GLsizei * count, GLhandleARB * obj)
+void PACKSPU_APIENTRY packspu_GetAttachedObjectsARB(VBoxGLhandleARB containerObj, GLsizei maxCount, GLsizei * count, VBoxGLhandleARB * obj)
 {
     GET_THREAD(thread);
@@ -107 +107 @@
     if (!obj) return;
 
-    pLocal = (GLsizei*) crAlloc(maxCount*sizeof(GLhandleARB)+sizeof(GLsizei));
+    pLocal = (GLsizei*) crAlloc(maxCount*sizeof(VBoxGLhandleARB)+sizeof(GLsizei));
     if (!pLocal) return;
 
@@ -116 +116 @@
 
     if (count) *count=*pLocal;
-    crMemcpy(obj, &pLocal[1], *pLocal*sizeof(GLhandleARB));
+    crMemcpy(obj, &pLocal[1], *pLocal*sizeof(VBoxGLhandleARB));
     crFree(pLocal);
 }
@@ -122 +122 @@
 AssertCompile(sizeof(GLsizei) == 4);
 
-void PACKSPU_APIENTRY packspu_GetInfoLogARB(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog)
+void PACKSPU_APIENTRY packspu_GetInfoLogARB(VBoxGLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog)
 {
     GET_THREAD(thread);

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c

@@ -130 +130 @@
 }
 
-void PACK_APIENTRY packspu_DeleteObjectARB(GLhandleARB obj)
+void PACK_APIENTRY packspu_DeleteObjectARB(VBoxGLhandleARB obj)
 {
     GLuint hwid = crStateGetProgramHWID(obj);