Changeset 51393 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

May 26, 2014 12:39:34 PM (11 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: remove untested non-HGSMI path.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• pointer.c (modified) (1 diff)
• setmode.c (modified) (2 diffs)
• vboxvideo.c (modified) (4 diffs)
• vboxvideo.h (modified) (2 diffs)
• vbva.c (modified) (4 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/pointer.c

@@ -542 +542 @@
 
     TRACE_ENTRY();
-    if (!pVBox->fHaveHGSMI)
-        return FALSE;
     pVBox->pCurs = pCurs = xf86CreateCursorInfoRec();
     if (!pCurs) {

trunk/src/VBox/Additions/x11/vboxvideo/setmode.c

@@ -100 +100 @@
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     uint32_t offStart, cwReal = cWidth;
+    uint16_t fFlags;
 
     TRACE_LOG("cDisplay=%u, cWidth=%u, cHeight=%u, x=%d, y=%d, displayWidth=%d\n",
@@ -121 +122 @@
         VBoxVideoSetModeRegisters(cwReal, cHeight, pScrn->displayWidth,
                                   vboxBPP(pScrn), 0, x, y);
-    if (pVBox->fHaveHGSMI)
-    {
-        uint16_t fFlags = VBVA_SCREEN_F_ACTIVE;
-        fFlags |= (pVBox->afDisabled[cDisplay] ? VBVA_SCREEN_F_DISABLED : 0);
-        VBoxHGSMIProcessDisplayInfo(&pVBox->guestCtx, cDisplay, x, y,
-                                    offStart, pVBox->cbLine, cwReal, cHeight,
-                                    vboxBPP(pScrn), fFlags);
-    }
+    fFlags = VBVA_SCREEN_F_ACTIVE;
+    fFlags |= (pVBox->afDisabled[cDisplay] ? VBVA_SCREEN_F_DISABLED : 0);
+    VBoxHGSMIProcessDisplayInfo(&pVBox->guestCtx, cDisplay, x, y,
+                                offStart, pVBox->cbLine, cwReal, cHeight,
+                                vboxBPP(pScrn), fFlags);
     return TRUE;
 }

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -1082 +1082 @@
     pScrn->vtSema = TRUE;
 
-    if (vbox_open (pScrn, pScreen, pVBox)) {
-        vboxEnableVbva(pScrn);
-    }
+    vbox_open (pScrn, pScreen, pVBox);
+    vboxEnableVbva(pScrn);
     VBoxInitialiseSizeHints(pScrn);
 
@@ -1231 +1230 @@
     }
 #endif
-    if (pVBox->fHaveHGSMI)
-        vboxEnableVbva(pScrn);
+    vboxEnableVbva(pScrn);
     /* Re-assert this in case we had a change request while switched out. */
     if (pVBox->FBSize.cx && pVBox->FBSize.cy)
@@ -1256 +1254 @@
 
     TRACE_ENTRY();
-    if (pVBox->fHaveHGSMI)
-        vboxDisableVbva(pScrn);
+    vboxDisableVbva(pScrn);
     vboxClearVRAM(pScrn, 0, 0);
 #ifdef VBOX_DRI_OLD
@@ -1287 +1284 @@
     if (pScrn->vtSema)
     {
-        if (pVBox->fHaveHGSMI)
-            vboxDisableVbva(pScrn);
+        vboxDisableVbva(pScrn);
         vboxClearVRAM(pScrn, 0, 0);
     }

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -175 +175 @@
     /** Do we know that the guest can handle absolute co-ordinates? */
     Bool guestCanAbsolute;
-    /** Does this host support sending graphics commands using HGSMI? */
-    Bool fHaveHGSMI;
     /** Number of screens attached */
     uint32_t cScreens;
@@ -218 +216 @@
 extern Bool vbox_init(int scrnIndex, VBOXPtr pVBox);
 extern Bool vbox_cursor_init (ScreenPtr pScreen);
-extern Bool vbox_open (ScrnInfoPtr pScrn, ScreenPtr pScreen, VBOXPtr pVBox);
+extern void vbox_open (ScrnInfoPtr pScrn, ScreenPtr pScreen, VBOXPtr pVBox);
 extern void vbox_close (ScrnInfoPtr pScrn, VBOXPtr pVBox);
 extern Bool vbox_device_available(VBOXPtr pVBox);

trunk/src/VBox/Additions/x11/vboxvideo/vbva.c

@@ -60 +60 @@
 
     pVBox = pScrn->driverPrivate;
-    if (pVBox->fHaveHGSMI == FALSE || !pScrn->vtSema)
+    if (!pScrn->vtSema)
         return;
 
@@ -179 +179 @@
     void *pvGuestHeapMemory;
 
-    if (!pVBox->fHaveHGSMI)
-        return FALSE;
     VBoxHGSMIGetBaseMappingInfo(pScrn->videoRam * 1024, &offVRAMBaseMapping,
                                 NULL, &offGuestHeapMemory, &cbGuestHeapMemory,
@@ -225 +223 @@
 }
 
-Bool
+void
 vbox_open(ScrnInfoPtr pScrn, ScreenPtr pScreen, VBOXPtr pVBox)
 {
     TRACE_ENTRY();
 
-    pVBox->fHaveHGSMI = vboxInitVbva(pScrn->scrnIndex, pScreen, pVBox);
-    return pVBox->fHaveHGSMI;
+    if (!vboxInitVbva(pScrn->scrnIndex, pScreen, pVBox))
+        FatalError("failed to initialise vboxvideo graphics acceleration.\n");
 }
 
@@ -294 +292 @@
 
     TRACE_ENTRY();
-    if (!pVBox->fHaveHGSMI)  /* Ths function should not have been called */
-        return;
     for (i = 0; i < pVBox->cScreens; ++i)
         VBoxVBVADisable(&pVBox->aVbvaCtx[i], &pVBox->guestCtx, i);