Changeset 33684 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

Nov 2, 2010 12:17:19 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: fix hgcm fallback (for insufficient hgsmi resources)

Location:

trunk/src/VBox/GuestHost/OpenGL/util

Files:

• error.c (modified) (2 diffs)
• vboxhgcm.c (modified) (3 diffs)

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

@@ -241 +241 @@
         va_end( args );
 
-#if defined(WINDOWS) && defined(DEBUG) && !defined(IN_GUEST)
+#if defined(WINDOWS) && defined(DEBUG) && !defined(IN_GUEST) && !defined(DEBUG_misha)
         DebugBreak();
 #endif
@@ -322 +322 @@
             output = stderr;
         }
-#ifndef DEBUG
+#if !defined(DEBUG) || defined(DEBUG_misha)
         /* Release mode: only emit crDebug messages if CR_DEBUG
          * or CR_DEBUG_FILE is set.

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

@@ -50 +50 @@
 #endif
 
+#ifdef DEBUG_misha
+#ifdef CRASSERT
+# undef CRASSERT
+#endif
+#define CRASSERT Assert
+#endif
 //#define IN_GUEST
 //#if defined(IN_GUEST)
@@ -1378 +1384 @@
         if (RT_SUCCESS(rc))
         {
-            rc = pHgsmi->pfnBufferCreate(pHgsmi, CRVBOXHGSMI_PAGE_ALIGN(0x800000),
+            rc = pHgsmi->pfnBufferCreate(pHgsmi, CRVBOXHGSMI_PAGE_ALIGN(1),
                                             VBOXUHGSMI_SYNCHOBJECT_TYPE_EVENT,
                                             NULL,
@@ -1389 +1395 @@
                 return (HVBOXCRHGSMI_CLIENT) pClient;
             }
+            pClient->pCmdBuffer->pfnDestroy(pClient->pCmdBuffer);
         }
     }