Changeset 41928 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Jun 27, 2012 4:06:23 PM (13 years ago)

Author:

vboxsync

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

78793

Message:

crOpenGL: fix shader deletion

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_error.h (modified) (1 diff)
• state_tracker/state_glsl.c (modified) (1 diff)

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

@@ -41 +41 @@
 #  define CR_DDI_PROLOGUE() do { /*if (g_VBoxFbgFBreakDdi) {Assert(0);}*/ } while (0)
 # else
-#  define CRASSERT( PRED ) ((PRED)?(void)0:crError( "Assertion failed: %s, file %s, line %d", #PRED, __FILE__, __LINE__))
+#  define CRASSERT( PRED ) ((PRED)?(void)0:crWarning( "Assertion failed: %s, file %s, line %d", #PRED, __FILE__, __LINE__))
 #  define CR_DDI_PROLOGUE() do {} while (0)
 # endif

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c

@@ -206 +206 @@
 {
     CRGLSLProgram *pProgram = crStateGetProgramObj(id);
+    CRASSERT(!pProgram || pProgram->hwid == id);
     return pProgram ? pProgram->hwid : 0;
 }