Changeset 46369 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jun 3, 2013 5:39:51 PM (12 years ago)

Author:

vboxsync

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

86185

Message:

crOpenGL: burn fixes

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_dump.h (modified) (1 diff)
• include/cr_pixeldata.h (modified) (1 diff)
• util/pixel.c (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_dump.h

@@ -127 +127 @@
 VBOXDUMPDECL(void) crRecDumpCurrentProgram(CR_RECORDER *pRec, CRContext *ctx);
 
-
-typedef DECLCALLBACKPTR(GLuint, PFNCRDUMPGETHWID)(void *pvObj);
+typedef DECLCALLBACK(GLuint) FNCRDUMPGETHWID(void *pvObj);
+typedef FNCRDUMPGETHWID *PFNCRDUMPGETHWID;
 void* crDmpHashtableSearchByHwid(CRHashTable *pHash, GLuint hwid, PFNCRDUMPGETHWID pfnGetHwid, unsigned long *pKey);
 

trunk/src/VBox/GuestHost/OpenGL/include/cr_pixeldata.h

@@ -45 +45 @@
 
 DECLEXPORT(void) crDumpNamedTGA(const char *fname, GLint w, GLint h, GLvoid *data);
-DECLEXPORT(void) crDumpNamedTGAV(const char* fname, GLint w, GLint h, GLvoid *data, va_list va);
-DECLEXPORT(void) crDumpNamedTGAF(const char* fname, GLint w, GLint h, GLvoid *data, ...);
+DECLEXPORT(void) crDumpNamedTGAV(GLint w, GLint h, GLvoid *data, const char* fname, va_list va);
+DECLEXPORT(void) crDumpNamedTGAF(GLint w, GLint h, GLvoid *data, const char* fname, ...);
 DECLEXPORT(void) crDumpTGA(GLint w, GLint h, GLvoid *data);
 #ifdef __cplusplus

trunk/src/VBox/GuestHost/OpenGL/util/pixel.c

@@ -1694 +1694 @@
     /*@todo this should be implemented properly*/
 
+#ifndef DEBUG_misha
     crWarning( "crPixelCopy3D:  simply crMemcpy'ing from srcPtr to dstPtr" );
+#endif
     if (dstFormat != srcFormat)
         crWarning( "crPixelCopy3D: formats don't match!" );
@@ -1845 +1847 @@
 }
 
-void crDumpNamedTGAV(const char* fname, GLint w, GLint h, GLvoid *data, va_list va)
+void crDumpNamedTGAV(GLint w, GLint h, GLvoid *data, const char* fname, va_list va)
 {
     char szName[4096];
@@ -1852 +1854 @@
 }
 
-void crDumpNamedTGAF(const char* fname, GLint w, GLint h, GLvoid *data, ...)
+void crDumpNamedTGAF(GLint w, GLint h, GLvoid *data, const char* fname, ...)
 {
     va_list va;
     int rc;
     va_start(va, fname);
-    crDumpNamedTGAV(fname, w, h, data, va);
+    crDumpNamedTGAV(w, h, data, fname, va);
     va_end(va);
 }