Changeset 46885 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 1, 2013 2:02:37 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: TexPresent fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Video/mp/common/VBoxMPDevExt.h (modified) (1 diff)
• Video/mp/wddm/VBoxMPVdma.cpp (modified) (6 diffs)
• Video/mp/wddm/VBoxMPVdma.h (modified) (1 diff)
• Video/mp/wddm/VBoxMPWddm.cpp (modified) (3 diffs)
• Video/mp/wddm/VBoxMPWddm.h (modified) (1 diff)
• Wine_new/d3d9/device.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -117 +117 @@
    BOOLEAN fTexPresentEnabled;
 
+   uint32_t u32CrConDefaultClientID;
+
    VBOXMP_CRCTLCON CrCtlCon;
    VBOXMP_CRSHGSMITRANSPORT CrHgsmiTransport;

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

@@ -932 +932 @@
 #endif
 
-static NTSTATUS vboxVdmaSubitVBoxTexPresent(PVBOXMP_DEVEXT pDevExt,
+static NTSTATUS vboxVdmaTexPresentSubmit(PVBOXMP_DEVEXT pDevExt,
         VBOXMP_CRPACKER *pCrPacker,
         uint32_t u32CrConClientID,
@@ -965 +965 @@
 }
 
+static NTSTATUS vboxVdmaCrCtlGetDefaultClientId(PVBOXMP_DEVEXT pDevExt, uint32_t *pu32ClienID)
+{
+    if (!pDevExt->u32CrConDefaultClientID)
+    {
+        int rc = VBoxMpCrCtlConConnect(&pDevExt->CrCtlCon, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR, &pDevExt->u32CrConDefaultClientID);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("VBoxMpCrCtlConConnect failed, rc %d", rc));
+            return STATUS_UNSUCCESSFUL;
+        }
+    }
+
+    *pu32ClienID = pDevExt->u32CrConDefaultClientID;
+    return STATUS_SUCCESS;
+}
+
+NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId, PVBOXWDDM_ALLOCATION pAllocation)
+{
+    RTRECT Rect, *pRect = NULL;
+    uint32_t cRects = 0;
+    uint32_t hostID = 0;
+    uint32_t cfg = VidPnSourceId | CR_PRESENT_FLAG_CLEAR_RECTS;
+    uint32_t u32CrConClientID;
+    NTSTATUS Status = vboxVdmaCrCtlGetDefaultClientId(pDevExt, &u32CrConClientID);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN(("vboxVdmaCrCtlGetDefaultClientId failed Status 0x%x", Status));
+        return Status;
+    }
+
+    VBOXMP_CRPACKER CrPacker;
+    VBoxMpCrPackerInit(&CrPacker);
+
+    if (pAllocation && pAllocation->hostID)
+    {
+        hostID = pAllocation->hostID;
+        cRects = 1;
+        Rect.xLeft = 0;
+        Rect.yTop = 0;
+        Rect.xRight = pAllocation->AllocData.SurfDesc.width;
+        Rect.yBottom = pAllocation->AllocData.SurfDesc.height;
+        pRect = &Rect;
+        cfg = VidPnSourceId;
+    }
+
+    Status = vboxVdmaTexPresentSubmit(pDevExt, &CrPacker, u32CrConClientID,
+            hostID, cfg, 0, 0, cRects, pRect);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN(("vboxVdmaCrCtlGetDefaultClientId failed Status 0x%x", Status));
+        return Status;
+    }
+
+    return STATUS_SUCCESS;
+ }
+
 static NTSTATUS vboxVdmaProcessVRegCmd(PVBOXMP_DEVEXT pDevExt, VBOXWDDM_CONTEXT *pContext,
         VBOXWDDM_DMA_ALLOCINFO *pSrcAllocInfo,
@@ -994 +1050 @@
             int32_t posY = pDstRects->ContextRect.top - pSrcRect->top;
 
-            Status = vboxVdmaSubitVBoxTexPresent(pDevExt, &pContext->CrPacker, pContext->u32CrConClientID, hostID, srcId, posX, posY, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects);
+            Status = vboxVdmaTexPresentSubmit(pDevExt, &pContext->CrPacker, pContext->u32CrConClientID, hostID, srcId, posX, posY, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects);
             if (NT_SUCCESS(Status))
             {
@@ -1004 +1060 @@
             }
             else
-                WARN(("vboxVdmaSubitVBoxTexPresent failed Status 0x%x", Status));
+                WARN(("vboxVdmaTexPresentSubmit failed Status 0x%x", Status));
         }
         else if (pSource->pPrimaryAllocation == pDstAlloc)
@@ -1015 +1071 @@
                 if (fChanged)
                 {
-                    Status = vboxVdmaSubitVBoxTexPresent(pDevExt, &pContext->CrPacker, pContext->u32CrConClientID, hostID, srcId, 0, 0, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects);
+                    Status = vboxVdmaTexPresentSubmit(pDevExt, &pContext->CrPacker, pContext->u32CrConClientID, hostID, srcId, 0, 0, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects);
                     if (NT_SUCCESS(Status))
                     {
@@ -1035 +1091 @@
                     }
                     else
-                        WARN(("vboxVdmaSubitVBoxTexPresent failed Status 0x%x", Status));
+                        WARN(("vboxVdmaTexPresentSubmit failed Status 0x%x", Status));
                 }
             }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.h

@@ -347 +347 @@
 NTSTATUS vboxVdmaProcessClrFillCmd(PVBOXMP_DEVEXT pDevExt, struct VBOXWDDM_CONTEXT *pContext, struct VBOXWDDM_DMA_PRIVATEDATA_CLRFILL *pCF, struct VBOXVDMAPIPE_FLAGS_DMACMD fFlags);
 
+
+NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId, PVBOXWDDM_ALLOCATION pAllocation);
+
 #endif /* #ifndef ___VBoxMPVdma_h___ */

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

@@ -3063 +3063 @@
                                 Assert(pDstAlloc->AllocData.SurfDesc.VidPnSourceId < VBOX_VIDEO_MAX_SCREENS);
 
+                                if (pSource->fHas3DVrs)
+                                    fBltFlags.fVisibleRegions = 1;
+
                                 if (!fRenderFromSharedDisabled && pSource->bVisible)
                                 {
@@ -5556 +5559 @@
             if (pDstAlloc)
             {
+                PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pDstAlloc->AllocData.SurfDesc.VidPnSourceId];
                 do
                 {
@@ -5573 +5577 @@
                     /* issue VBOXWDDM_ALLOC_TYPE_STD_SHADOWSURFACE ONLY in case there are no 3D contexts currently
                      * otherwise we would need info about all rects being updated on primary for visible rect reporting */
-                    if (!cContexts3D && !cContexts2D)
+                    if (!cContexts3D && !cContexts2D && !pSource->fHas3DVrs)
                     {
                         if (pDstAlloc->enmType == VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.h

@@ -168 +168 @@
     }
 
-    if (pAllocation && pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE)
-    {
+    if (pAllocation && pAllocation->hostID)
+    {
+        NTSTATUS Status = vboxVdmaTexPresentSetAlloc(pDevExt, srcId, pAllocation);
+        if (!NT_SUCCESS(Status))
+        {
+            WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
+        }
+
+        VBoxVrListClear(&pSource->VrList);
+        pSource->fHas3DVrs = TRUE;
+    }
+    else
+    {
+        if (pSource->fHas3DVrs)
+        {
+            NTSTATUS Status = vboxVdmaTexPresentSetAlloc(pDevExt, srcId, NULL);
+            if (!NT_SUCCESS(Status))
+            {
+                WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
+            }
+            pSource->fHas3DVrs = FALSE;
+        }
+
         RTRECT Rect;
         Rect.xLeft = 0;
         Rect.yTop = 0;
-        Rect.xRight = pAllocation->AllocData.SurfDesc.width;
-        Rect.yBottom = pAllocation->AllocData.SurfDesc.height;
+        Rect.xRight = pAllocation ? pAllocation->AllocData.SurfDesc.width : pSource->AllocData.SurfDesc.width;
+        Rect.yBottom = pAllocation ? pAllocation->AllocData.SurfDesc.height : pSource->AllocData.SurfDesc.height;
 
         VBoxVrListRectsSet(&pSource->VrList, 1, &Rect, NULL);
     }
-    else
-        VBoxVrListClear(&pSource->VrList);
-
-    pSource->fHas3DVrs = FALSE;
 
     KIRQL OldIrql;

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c

@@ -293 +293 @@
     if (refs != 1)
     {
-        ERR("unexpected ref count %d, destroying in anyway", refs);
+        WARN("unexpected ref count %d, destroying in anyway", refs);
     }
 
@@ -3917 +3917 @@
     if (device->refcount != 1)
     {
-        ERR("unexpected ref count %d, destroying in anyway", device->refcount);
+        WARN("unexpected ref count %d, destroying in anyway", device->refcount);
     }
     wined3d_refs = d3d9_device_Term(device);