Changeset 50940 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Apr 1, 2014 11:22:34 AM (11 years ago)

Author:

vboxsync

Message:

compilable w/o CROGL

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleVRDPServer.cpp (modified) (2 diffs)
• DisplayImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -2131 +2131 @@
     }
 
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
     VBOXCRCMDCTL_HGCM data;
     data.Hdr.enmType = VBOXCRCMDCTL_TYPE_HGCM;
@@ -2147 +2148 @@
 
     LogRel(("VRDE: %s 3D redirect.\n", fEnable? "Enabled": "Disabled"));
-#ifdef DEBUG_misha
+# ifdef DEBUG_misha
     AssertFailed();
+# endif
 #endif
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -315 +315 @@
         uint32_t cy = 0;
 
-#ifdef VBOX_WITH_CROGL
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
         BOOL f3DSnapshot = FALSE;
         BOOL is3denabled;
@@ -731 +731 @@
 }
 
-#ifdef VBOX_WITH_CROGL
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 int Display::crOglWindowsShow(bool fShow)
 {
@@ -2446 +2446 @@
             }
         }
-#endif /* VBOX_WITH_CROGL */
+#endif /* #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) */
     }
     else
@@ -2597 +2597 @@
 }
 
-#ifdef VBOX_WITH_CROGL
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 BOOL Display::displayCheckTakeScreenshotCrOgl(Display *pDisplay, ULONG aScreenId, uint8_t *pu8Data, uint32_t u32Width, uint32_t u32Height)
 {
@@ -3610 +3610 @@
 }
 
-#ifdef VBOX_WITH_CROGL
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 void Display::crViewportNotify(VMMDev *pVMMDev, ULONG aScreenId, ULONG x, ULONG y, ULONG width, ULONG height)
 {
@@ -4394 +4394 @@
 #endif
 
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 DECLCALLBACK(void)  Display::displayCrHgcmCtlSubmitCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext)
 {
@@ -4446 +4447 @@
 }
 
-#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 bool  Display::handleCrVRecScreenshotBegin(uint32_t uScreen, uint64_t u64TimeStamp)
 {
@@ -5056 +5056 @@
     pThis->IConnector.pfnCrHgsmiControlProcess = Display::displayCrHgsmiControlProcess;
 #endif
+#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
     pThis->IConnector.pfnCrHgcmCtlSubmit       = Display::displayCrHgcmCtlSubmit;
+#endif
 #ifdef VBOX_WITH_HGSMI
     pThis->IConnector.pfnVBVAEnable            = Display::displayVBVAEnable;