Changeset 32877 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Oct 1, 2010 10:51:28 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: basics for chromium over hgsmi

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• Makefile.kmk (modified) (2 diffs)
• wddm/VBoxDispD3D.cpp (modified) (3 diffs)
• wddm/VBoxUhgsmiDisp.cpp (added)
• wddm/VBoxUhgsmiDisp.h (added)

trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

@@ -76 +76 @@
  endif
 VBoxDispD3D_TEMPLATE = VBOXGUESTR3DLL
-VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXVDMA VBOXWDDMDISP
+VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP
 # VBoxDispD3D_DEFS    += VBOXDISPMP_TEST
 ifdef VBOXWDDM_WITH_VBVA
@@ -94 +94 @@
     wddm/VBoxDispMp.cpp \
     wddm/VBoxScreen.cpp \
+    wddm/VBoxUhgsmiDisp.cpp \
     wddm/VBoxDispMpTst.cpp \
         wddm/VBoxDispD3D.def \

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -5511 +5511 @@
         --pData->cPatchLocationList;
         ++pData->cAllocations;
+
+        ++pData->pAllocationList;
+        ++pData->pPatchLocationList;
+        pData->pvCommandBuffer = (VOID*)(((uint8_t*)pData->pvCommandBuffer) + 4);
+
     }
     else
         hr = S_FALSE;
-
-    ++pData->pAllocationList;
-    ++pData->pPatchLocationList;
-    pData->pvCommandBuffer = (VOID*)(((uint8_t*)pData->pvCommandBuffer) + 4);
 
     return hr;
@@ -5538 +5539 @@
             NscAdd.cPatchLocationList = pDevice->DefaultContext.ContextInfo.PatchLocationListSize;
             NscAdd.cAllocations = 0;
+            Assert(NscAdd.cbCommandBuffer >= sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR));
+            if (NscAdd.cbCommandBuffer < sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR))
+                return E_FAIL;
+
+            PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR pHdr = (PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR)NscAdd.pvCommandBuffer;
+            pHdr->enmCmd = VBOXVDMACMD_TYPE_DMA_NOP;
+            NscAdd.pvCommandBuffer = (VOID*)(((uint8_t*)NscAdd.pvCommandBuffer) + sizeof (*pHdr));
+            NscAdd.cbCommandBuffer -= sizeof (*pHdr);
             bReinitRenderData = FALSE;
         }
@@ -5574 +5583 @@
         RenderData.NumPatchLocations = pDevice->DefaultContext.ContextInfo.PatchLocationListSize - NscAdd.cPatchLocationList;
         Assert(RenderData.NumPatchLocations == NscAdd.cAllocations);
-        RenderData.NewCommandBufferSize = sizeof (VBOXVDMACMD) + 4 * (100);
-        RenderData.NewAllocationListSize = 100;
-        RenderData.NewPatchLocationListSize = 100;
+//        RenderData.NewCommandBufferSize = sizeof (VBOXVDMACMD) + 4 * (100);
+//        RenderData.NewAllocationListSize = 100;
+//        RenderData.NewPatchLocationListSize = 100;
         RenderData.hContext = pDevice->DefaultContext.ContextInfo.hContext;