Changeset 49264 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Oct 23, 2013 5:10:57 PM (11 years ago)

Author:

vboxsync

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

90177

Message:

crOpenGL: dumping/logging

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• pack/packspu.h (modified) (2 diffs)
• pack/packspu_glsl.c (modified) (1 diff)
• pack/packspu_init.c (modified) (2 diffs)
• pack/packspu_special (modified) (1 diff)

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

@@ -580 +580 @@
 VBoxOGLpackspu_DEFS.win   += VBOX_WITH_CRHGSMI
 endif
+ifdef VBOX_WITH_CRDUMPER
+VBoxOGLpackspu_DEFS       += VBOX_WITH_CRDUMPER
+endif
+ifdef VBOX_WITH_CRPACKSPU_DUMPER
+VBoxOGLpackspu_DEFS       += VBOX_WITH_CRPACKSPU_DUMPER
+endif
 ifdef VBOX_WITH_WDDM
 VBoxOGLpackspu_DEFS.win   += VBOX_WITH_WDDM

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.h

@@ -20 +20 @@
 #include "cr_threads.h"
 #include "state/cr_client.h"
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+# include "cr_dump.h"
+#endif
 
 typedef struct thread_info_t ThreadInfo;
@@ -69 +72 @@
 #if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
     bool bRunningUnderWDDM;
+#endif
+
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+    SPUDispatchTable self;
+
+    CR_RECORDER Recorder;
+    CR_DBGPRINT_DUMPER Dumper;
 #endif
 

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

@@ -146 +146 @@
 }
 
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+static void packspu_RecCheckInitRec()
+{
+    if (pack_spu.Recorder.pDumper)
+        return;
+
+    crDmpDbgPrintInit(&pack_spu.Dumper);
+
+    crRecInit(&pack_spu.Recorder, NULL /*pBlitter: we do not support blitter operations here*/, &pack_spu.self, &pack_spu.Dumper.Base);
+}
+#endif
+
 void PACKSPU_APIENTRY packspu_LinkProgram(GLuint program)
 {
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+    GLint linkStatus = 0;
+#endif
+
     crStateLinkProgram(program);
     crPackLinkProgram(program);
-}
+
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+    pack_spu.self.GetObjectParameterivARB(program, GL_OBJECT_LINK_STATUS_ARB, &linkStatus);
+    Assert(linkStatus);
+    if (!linkStatus)
+    {
+        CRContext *ctx = crStateGetCurrent();
+        packspu_RecCheckInitRec();
+        crRecDumpProgram(&pack_spu.Recorder, ctx, program, program);
+    }
+#endif
+}
+
+void PACKSPU_APIENTRY packspu_CompileShader(GLuint shader)
+{
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+    GLint compileStatus = 0;
+#endif
+
+//    crStateCompileShader(shader);
+    crPackCompileShader(shader);
+
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+    pack_spu.self.GetObjectParameterivARB(shader, GL_OBJECT_COMPILE_STATUS_ARB, &compileStatus);
+    Assert(compileStatus);
+    if (!compileStatus)
+    {
+        CRContext *ctx = crStateGetCurrent();
+        packspu_RecCheckInitRec();
+        crRecDumpShader(&pack_spu.Recorder, ctx, shader, shader);
+    }
+#endif
+}
+

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

@@ -51 +51 @@
 #endif
 
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+    memset(&pack_spu.Dumper, 0, sizeof (pack_spu.Dumper));
+#endif
+
     if (!CRPACKSPU_IS_WDDM_CRHGSMI())
     {
@@ -76 +80 @@
 packSPUSelfDispatch(SPUDispatchTable *self)
 {
+#ifdef VBOX_WITH_CRPACKSPU_DUMPER
+    crSPUInitDispatchTable( &(pack_spu.self) );
+    crSPUCopyDispatchTable( &(pack_spu.self), self );
+#else
     (void)self;
+#endif
 }
 

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

@@ -130 +130 @@
 StringMarkerGREMEDY
 GenTextures
+CompileShader