Changeset 41485 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

May 29, 2012 3:31:45 PM (13 years ago)

Author:

vboxsync

Message:

additions compile fix for VBOX_WITH_CROGL=

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• disp/Makefile.kmk (modified) (1 diff)
• mp/wddm/VBoxMPCr.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

@@ -100 +100 @@
  VBoxDispD3D_DEFS   += VBOXWDDM_TEST_UHGSMI
 endif
+ifdef VBOX_WITH_CROGL
+ VBoxDispD3D_DEFS   += VBOX_WITH_CROGL
+endif
 VBoxDispD3D_INCS     = ../../../include ..
 VBoxDispD3D_SOURCES  = \

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPCr.cpp

@@ -22 +22 @@
 #include <VBox/HostServices/VBoxCrOpenGLSvc.h>
 
+#ifdef VBOX_WITH_CROGL
 #include <cr_protocol.h>
 
-#if 0
-#include <cr_pack.h>
+# if 0
+#  include <cr_pack.h>
 
 typedef struct PVBOXMP_SHGSMIPACKER
@@ -82 +83 @@
     return VINF_SUCCESS;
 }
+# endif
 #endif
 
@@ -267 +269 @@
 bool VBoxMpCrCtlConIs3DSupported()
 {
+#ifdef VBOX_WITH_CROGL
     VBOXMP_CRCTLCON CrCtlCon = {0};
     uint32_t u32ClientID = 0;
@@ -281 +284 @@
 
     return true;
-}
+#else
+    return false;
+#endif
+}