Changeset 50149 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jan 21, 2014 6:18:36 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91701

Message:

crOpenGL: bugfixes

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (2 diffs)
• DevVGA_VDMA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -593 +593 @@
 int      VBVAUpdateDisplay (PVGASTATE pVGAState);
 void     VBVAReset (PVGASTATE pVGAState);
+int      VBVAGetScreenInfo(PVGASTATE pVGAState, unsigned uScreenId, struct VBVAINFOSCREEN *pScreen, void **ppvVram);
 
 bool VBVAIsEnabled(PVGASTATE pVGAState);
 
 void VBVARaiseIrq (PVGASTATE pVGAState, uint32_t fFlags);
+void VBVARaiseIrqNoWait(PVGASTATE pVGAState, uint32_t fFlags);
 
 /* @return host-guest flags that were set on reset

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

@@ -1918 +1918 @@
 #if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_VDMA) || defined(VBOX_WITH_WDDM))
     PVGASTATE pVGAState = (PVGASTATE)pvCallback;
-    VBVARaiseIrq (pVGAState, 0);
+    VBVARaiseIrqNoWait (pVGAState, 0);
 #else
     NOREF(pvCallback);
@@ -2436 +2436 @@
     pVGAState->pHGSMI = NULL;
 }
+
+int VBVAGetScreenInfo(PVGASTATE pVGAState, unsigned uScreenId, struct VBVAINFOSCREEN *pScreen, void **ppvVram)
+{
+    PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
+    PHGSMIINSTANCE pIns = pVGAState->pHGSMI;
+    VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext (pIns);
+    int rc = PDMCritSectEnter(&pVGAState->CritSect, VERR_SEM_BUSY);
+    if (RT_SUCCESS(rc))
+    {
+        if (uScreenId < pCtx->cViews)
+        {
+            VBVAVIEW *pView = &pCtx->aViews[uScreenId];
+            if (pView->pVBVA)
+            {
+                uint8_t *pu8VRAM = pVGAState->vram_ptrR3 + pView->view.u32ViewOffset;
+                *pScreen = pView->screen;
+                *ppvVram = (void*)pu8VRAM;
+                rc = VINF_SUCCESS;
+            }
+            else
+            {
+                /* pretend disabled */
+                memset(pScreen, 0, sizeof (*pScreen));
+                pScreen->u16Flags = VBVA_SCREEN_F_DISABLED;
+                pScreen->u32ViewIndex = uScreenId;
+                *ppvVram = NULL;
+                rc = VINF_SUCCESS;
+            }
+        }
+        else
+            rc = VERR_INVALID_PARAMETER;
+
+        PDMCritSectLeave(&pVGAState->CritSect);
+    }
+    return rc;
+}

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

@@ -356 +356 @@
 }
 
+static DECLCALLBACK(int) vboxVDMACrCmdCltDmGet(HVBOXCRCMDCLT hClt, uint32_t idScreen, struct VBVAINFOSCREEN *pScreen, void **ppvVram)
+{
+    struct VBOXVDMAHOST *pVdma = hClt;
+    PVGASTATE pVGAState = pVdma->pVGAState;
+
+    return VBVAGetScreenInfo(pVGAState, idScreen, pScreen, ppvVram);
+}
+
 static int vboxVDMACrCtlHgsmiSetup(struct VBOXVDMAHOST *pVdma)
 {
@@ -366 +374 @@
         CltInfo.hClient = pVdma;
         CltInfo.pfnCmdGet = vboxVDMACrCmdCltCmdGet;
+        CltInfo.pfnDmGet = vboxVDMACrCmdCltDmGet;
         PVGASTATE pVGAState = pVdma->pVGAState;
         pCmd->pvVRamBase = pVGAState->vram_ptrR3;