Changeset 56179 in vbox

Timestamp:

Jun 1, 2015 1:22:59 PM (10 years ago)

Author:

vboxsync

Message:

3D: adjust CRASSERT() macro a bit and fix false assertion.

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_error.h (modified) (1 diff)
• util/error.c (modified) (1 diff)

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

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

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

@@ -160 +160 @@
         {
             int rc;
-            rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE); CRASSERT(rc);
+            rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE); CRASSERT(rc==0);
 # ifdef IN_GUEST
             rc = VbglR3Init();