Changeset 51358 in vbox

Timestamp:

May 22, 2014 5:16:05 PM (11 years ago)

Author:

vboxsync

Message:

fix crogl disabled

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA_VBVA.cpp (modified) (7 diffs)
• DevVGA_VDMA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -1867 +1867 @@
             if (pView->pVBVA)
             {
+#ifdef VBOX_WITH_CRHGSMI
                 Assert(!vboxCmdVBVAIsEnabled(pVGAState));
+#endif
                 vbvaEnable (iView, pVGAState, pCtx, pView->pVBVA, pView->u32VBVAOffset, true /* fRestored */);
                 vbvaResize (pVGAState, pView, &pView->screen);
@@ -2137 +2139 @@
         case VBVA_INFO_VIEW:
         {
+#ifdef VBOX_WITH_CRHGSMI
             if (vboxCmdVBVAIsEnabled(pVGAState))
             {
@@ -2143 +2146 @@
                 break;
             }
+#endif
 
             if (cbBuffer < sizeof (VBVAINFOVIEW))
@@ -2202 +2206 @@
             }
 
+#ifdef VBOX_WITH_CRHGSMI
             if (vboxCmdVBVAIsEnabled(pVGAState))
             {
@@ -2208 +2213 @@
                 break;
             }
+#endif
 
             VBVAINFOSCREEN *pScreen = (VBVAINFOSCREEN *)pvBuffer;
@@ -2216 +2222 @@
         case VBVA_ENABLE:
         {
+#ifdef VBOX_WITH_CRHGSMI
             if (vboxCmdVBVAIsEnabled(pVGAState))
             {
@@ -2222 +2229 @@
                 break;
             }
+#endif
 
             if (cbBuffer < sizeof (VBVAENABLE))

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -3410 +3410 @@
 int vboxVDMASaveLoadDone(struct VBOXVDMAHOST *pVdma)
 {
+#ifdef VBOX_WITH_CRHGSMI
     VBVAEXHOSTCTL* pHCtl = VBoxVBVAExHCtlCreate(&pVdma->CmdVbva, VBVAEXHOSTCTL_TYPE_HH_LOADSTATE_DONE);
     if (!pHCtl)
@@ -3429 +3430 @@
         return rc;
     }
-
+#endif
     return VINF_SUCCESS;
 }