Changeset 33241 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Oct 19, 2010 4:37:06 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: chromium hgsmi working (still disabled to make some cleaning)

Location:

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

Files:

• Makefile.kmk (modified) (2 diffs)
• wddm/VBoxCrHgsmi.cpp (modified) (2 diffs)
• wddm/VBoxDispD3D.cpp (modified) (4 diffs)
• wddm/VBoxDispD3DCmn.h (modified) (3 diffs)
• wddm/VBoxUhgsmiBase.h (modified) (1 diff)
• wddm/VBoxUhgsmiDisp.cpp (modified) (3 diffs)
• wddm/VBoxUhgsmiKmt.cpp (modified) (4 diffs)

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

@@ -86 +86 @@
  VBoxDispD3D_DEFS   += VBOXWDDM_TEST_UHGSMI
 endif
-ifdef VBOX_WITH_CRHGSMI
- VBoxDispD3D_DEFS   += VBOX_WITH_CRHGSMI
-endif
 VBoxDispD3D_SOURCES  = \
         wddm/VBoxDispD3D.cpp \
@@ -95 +92 @@
     wddm/VBoxDispMp.cpp \
     wddm/VBoxScreen.cpp \
-    $(if $(VBOX_WITH_CRHGSMI),wddm/VBoxUhgsmiDisp.cpp,) \
-    $(if $(VBOX_WITH_CRHGSMI),wddm/VBoxUhgsmiKmt.cpp,) \
     wddm/VBoxDispMpTst.cpp \
         wddm/VBoxDispD3D.def \
         wddm/VBoxDispD3D.rc
+#ifdef VBOX_WITH_CRHGSMI
+#VBoxDispD3D_SOURCES += \
+#    wddm/VBoxUhgsmiDisp.cpp \
+#    wddm/VBoxUhgsmiKmt.cpp
+#VBoxDispD3D_DEFS   += VBOX_WITH_CRHGSMI
+#endif
 VBoxDispD3D_LIBS     = \
         $(VBOX_LIB_IPRT_GUEST_R3) \

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

@@ -109 +109 @@
 VBOXCRHGSMI_DECL(int) VBoxCrHgsmiTerm()
 {
+    Assert(0);
+#if 0
     PVBOXUHGSMI_PRIVATE_KMT pHgsmiGL = gt_pHgsmiGL;
     if (pHgsmiGL)
@@ -119 +121 @@
     if (g_pfnVBoxDispCrHgsmiTerm)
         g_pfnVBoxDispCrHgsmiTerm();
+#endif
     return VINF_SUCCESS;
 }

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

@@ -2903 +2903 @@
 
             vboxVDbgPrint(("VBoxDispD3D: DLL loaded.\n"));
-#ifdef VBOXWDDMDISP_DEBUG
+#ifdef VBOXWDDMDISP_DEBUG_VEHANDLER
             vboxVDbgVEHandlerRegister();
 #endif
@@ -2939 +2939 @@
         case DLL_PROCESS_DETACH:
         {
-#ifdef VBOXWDDMDISP_DEBUG
+#ifdef VBOXWDDMDISP_DEBUG_VEHANDLER
             vboxVDbgVEHandlerUnregister();
 #endif
@@ -8011 +8011 @@
     vboxVDbgDoMpPrintF(pDevice, "%s left(%d), top(%d), right(%d), bottom(%d) %s", pPrefix, pRect->left, pRect->top, pRect->right, pRect->bottom, pSuffix);
 }
+#endif
+
+#ifdef VBOXWDDMDISP_DEBUG_VEHANDLER
 
 static PVOID g_VBoxWDbgVEHandler = NULL;
@@ -8023 +8026 @@
             break;
         default:
-            Assert(0);
+            AssertRelease(0);
             break;
     }

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3DCmn.h

@@ -44 +44 @@
 # define VBOXWDDMDISP_DEBUG_FLOW
 # define VBOXWDDMDISP_DEBUG_DUMPSURFDATA
+# define VBOXWDDMDISP_DEBUG_VEHANDLER
 #endif
+
+//#define VBOXWDDMDISP_DEBUG_VEHANDLER
 
 #if defined(VBOXWDDMDISP_DEBUG) || defined(VBOX_WDDMDISP_WITH_PROFILE) || defined(VBOXWDDM_TEST_UHGSMI)
@@ -70 +73 @@
 #endif
 
+#ifdef VBOXWDDMDISP_DEBUG_VEHANDLER
+void vboxVDbgVEHandlerRegister();
+void vboxVDbgVEHandlerUnregister();
+#endif
+
 #ifdef VBOXWDDMDISP_DEBUG
 extern bool g_VDbgTstDumpEnable;
@@ -77 +85 @@
 void vboxVDbgDoMpPrintRect(const PVBOXWDDMDISP_DEVICE pDevice, const char * pPrefix, const RECT *pRect, const char * pSuffix);
 void vboxVDbgDoMpPrintAlloc(const PVBOXWDDMDISP_DEVICE pDevice, const char * pPrefix, const PVBOXWDDMDISP_RESOURCE pRc, uint32_t iAlloc, const char * pSuffix);
-void vboxVDbgVEHandlerRegister();
-void vboxVDbgVEHandlerUnregister();
 
 #define vboxVDbgBreak() AssertBreakpoint()

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiBase.h

@@ -77 +77 @@
         if (cPages == cBufPages)
         {
+            *pNumPages = 0;
             fLockFlags.LockEntire = 1;
         }

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

@@ -53 +53 @@
 {
     PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuffer = VBOXUHGSMID3D_GET_BUFFER(pBuf);
-    D3DDDICB_LOCK DdiLock;
+    D3DDDICB_LOCK DdiLock = {0};
     DdiLock.hAllocation = pBuffer->BasePrivate.hAllocation;
     DdiLock.PrivateDriverData = 0;
@@ -63 +63 @@
         return rc;
 
-    DdiLock.pPages = pBuffer->aLockPageIndices;
+    if (DdiLock.NumPages)
+        DdiLock.pPages = pBuffer->aLockPageIndices;
+    else
+        DdiLock.pPages = NULL;
 
     HRESULT hr = pBuffer->pDevice->RtCallbacks.pfnLockCb(pBuffer->pDevice->hDevice, &DdiLock);
@@ -107 +110 @@
 
     PVBOXUHGSMI_PRIVATE_D3D pPrivate = VBOXUHGSMID3D_GET(pHgsmi);
-    PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuf = (PVBOXUHGSMI_BUFFER_PRIVATE_D3D)RTMemAllocZ(RT_OFFSETOF(VBOXUHGSMI_BUFFER_PRIVATE_D3D, aLockPageIndices));
+    PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuf = (PVBOXUHGSMI_BUFFER_PRIVATE_D3D)RTMemAllocZ(RT_OFFSETOF(VBOXUHGSMI_BUFFER_PRIVATE_D3D, aLockPageIndices[cPages]));
     Assert(pBuf);
     if (pBuf)

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

@@ -51 +51 @@
 {
     PVBOXUHGSMI_BUFFER_PRIVATE_KMT pBuffer = VBOXUHGSMIKMT_GET_BUFFER(pBuf);
-    D3DKMT_LOCK DdiLock;
+    D3DKMT_LOCK DdiLock = {0};
     DdiLock.hDevice = pBuffer->pHgsmi->Device.hDevice;
     DdiLock.hAllocation = pBuffer->BasePrivate.hAllocation;
@@ -64 +64 @@
         return rc;
 
-    DdiLock.pPages = pBuffer->aLockPageIndices;
+    if (DdiLock.NumPages)
+        DdiLock.pPages = pBuffer->aLockPageIndices;
+    else
+        DdiLock.pPages = NULL;
 
     NTSTATUS Status = pBuffer->pHgsmi->Callbacks.pfnD3DKMTLock(&DdiLock);
@@ -111 +114 @@
 
     PVBOXUHGSMI_PRIVATE_KMT pPrivate = VBOXUHGSMIKMT_GET(pHgsmi);
-    PVBOXUHGSMI_BUFFER_PRIVATE_KMT pBuf = (PVBOXUHGSMI_BUFFER_PRIVATE_KMT)RTMemAllocZ(RT_OFFSETOF(VBOXUHGSMI_BUFFER_PRIVATE_KMT, aLockPageIndices));
+    PVBOXUHGSMI_BUFFER_PRIVATE_KMT pBuf = (PVBOXUHGSMI_BUFFER_PRIVATE_KMT)RTMemAllocZ(RT_OFFSETOF(VBOXUHGSMI_BUFFER_PRIVATE_KMT, aLockPageIndices[cPages]));
     Assert(pBuf);
     if (pBuf)
@@ -240 +243 @@
 HRESULT vboxUhgsmiKmtDestroy(PVBOXUHGSMI_PRIVATE_KMT pHgsmi)
 {
+    Assert(0);
     HRESULT hr = vboxDispKmtDestroyContext(&pHgsmi->Context);
     Assert(hr == S_OK);