Changeset 30308 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Jun 18, 2010 12:11:00 PM (15 years ago)

Author:

vboxsync

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

62855

Message:

wddm/2d: bugfixing

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Files:

• VBoxVideoIf.h (modified) (2 diffs)
• VBoxVideoVhwa.cpp (modified) (2 diffs)
• VBoxVideoWddm.cpp (modified) (5 diffs)
• VBoxVideoWddm.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoIf.h

@@ -26 +26 @@
 /* @todo: implement a check to ensure display & miniport versions match.
  * One would increase this whenever definitions in this file are changed */
-#define VBOXVIDEOIF_VERSION 2
+#define VBOXVIDEOIF_VERSION 3
 
 /* create allocation func */
@@ -58 +58 @@
 {
     VBOXWDDM_ALLOC_TYPE enmType;
+    D3DDDI_RESOURCEFLAGS fFlags;
     VBOXWDDM_SURFACE_DESC SurfDesc;
 } VBOXWDDM_ALLOCINFO, *PVBOXWDDM_ALLOCINFO;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

@@ -814 +814 @@
             vboxVhwaCommandSubmitAsynchAndComplete(pOverlay->pDevExt, pCmd);
 
+            pOverlay->pCurentAlloc = pAlloc;
+
             rc = VINF_SUCCESS;
         }
@@ -947 +949 @@
         {
             PVBOXWDDM_ALLOCATION pCurAlloc = &pRc->aAllocations[i];
-            rc = vboxVhwaHlpCreateSurface(pDevExt, pAlloc,
+            rc = vboxVhwaHlpCreateSurface(pDevExt, pCurAlloc,
                         0, pRc->cAllocations - 1, VBOXVHWA_SCAPS_OVERLAY | VBOXVHWA_SCAPS_VIDEOMEMORY | VBOXVHWA_SCAPS_LOCALVIDMEM | VBOXVHWA_SCAPS_COMPLEX,
                         VidPnSourceId);

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -1511 +1511 @@
                     pAllocationInfo->SupportedWriteSegmentSet = 2;
 #endif
-#ifndef VBOXWDDM_RENDER_FROM_SHADOW
+//#ifndef VBOXWDDM_RENDER_FROM_SHADOW
                     pAllocationInfo->Flags.CpuVisible = 1;
-#endif
+//#endif
                     break;
                 case VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC:
-                    Assert(pResource);
-                    if (pResource)
+//                    Assert(pResource);
+//                    if (pResource)
                     {
-                        Assert(pResource->cAllocations);
-                        if (pResource->cAllocations)
+//                        Assert(pResource->cAllocations);
+//                        if (pResource->cAllocations)
                         {
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                            if (pResource->RcDesc.fFlags.Overlay)
+                            if (pAllocInfo->fFlags.Overlay)
                             {
                                 /* actually we can not "properly" issue create overlay commands to the host here
@@ -1536 +1536 @@
                                     pAllocationInfo->Flags.CpuVisible = 1;
                                     pAllocationInfo->Size = pAllocation->SurfDesc.cbSize;
+
+                                    pAllocationInfo->AllocationPriority = D3DDDI_ALLOCATIONPRIORITY_HIGH;
                                 }
                                 else
@@ -1542 +1544 @@
 #endif
                         }
-                        else
-                            Status = STATUS_INVALID_PARAMETER;
+//                        else
+//                            Status = STATUS_INVALID_PARAMETER;
                     }
-                    /* do not break to set CPU visibility flag */
+                    break;
                 case VBOXWDDM_ALLOC_TYPE_STD_SHADOWSURFACE:
                 case VBOXWDDM_ALLOC_TYPE_STD_STAGINGSURFACE:
-                    pAllocationInfo->Flags.Value = 0;
                     pAllocationInfo->Flags.CpuVisible = 1;
                     break;
@@ -1558 +1559 @@
             }
 
-            if (Status != STATUS_SUCCESS)
+            if (Status == STATUS_SUCCESS)
+            {
+                pAllocation->UsageHint.Version = 0;
+                pAllocation->UsageHint.v1.Flags.Value = 0;
+                pAllocation->UsageHint.v1.Format = pAllocInfo->SurfDesc.format;
+                pAllocation->UsageHint.v1.SwizzledFormat = 0;
+                pAllocation->UsageHint.v1.ByteOffset = 0;
+                pAllocation->UsageHint.v1.Width = pAllocation->SurfDesc.width;
+                pAllocation->UsageHint.v1.Height = pAllocation->SurfDesc.height;
+                pAllocation->UsageHint.v1.Pitch = pAllocation->SurfDesc.pitch;
+                pAllocation->UsageHint.v1.Depth = 0;
+                pAllocation->UsageHint.v1.SlicePitch = 0;
+
+                Assert(!pAllocationInfo->pAllocationUsageHint);
+                pAllocationInfo->pAllocationUsageHint = &pAllocation->UsageHint;
+            }
+            else
                 vboxWddmAllocationDeleteFromResource(pResource, pAllocation);
         }
@@ -3263 +3280 @@
         int rc = vboxVhwaHlpOverlayCreate(pDevExt, pCreateOverlay->VidPnSourceId, &pCreateOverlay->OverlayInfo, pOverlay);
         AssertRC(rc);
-        if (RT_FAILURE(rc))
+        if (RT_SUCCESS(rc))
+        {
+            pCreateOverlay->hOverlay = pOverlay;;
+        }
+        else
+        {
+            vboxWddmMemFree(pOverlay);
             Status = STATUS_UNSUCCESSFUL;
+        }
     }
     else

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h

@@ -63 +63 @@
     VBOXWDDM_SURFACE_DESC SurfDesc;
     struct VBOXWDDM_RESOURCE *pResource;
+    /* to return to the Runtime on DxgkDdiCreateAllocation */
+    DXGK_ALLOCATIONUSAGEHINT UsageHint;
     uint32_t iIndex;
 } VBOXWDDM_ALLOCATION, *PVBOXWDDM_ALLOCATION;