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

Timestamp:

Oct 18, 2010 7:26:40 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: chromium hgsmi fixes

Location:

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

Files:

• VBoxDispD3D.cpp (modified) (2 diffs)
• VBoxUhgsmiDisp.cpp (modified) (1 diff)
• VBoxUhgsmiKmt.cpp (modified) (4 diffs)

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

@@ -728 +728 @@
 /* cr hgsmi */
 static VBOXCRHGSMI_CALLBACKS g_VBoxCrHgsmiCallbacks = {0};
-static VBOXUHGSMI_PRIVATE_KMT g_VBoxUhgsmiKmt;
-static uint32_t g_cVBoxUhgsmiKmtRefs = 0;
+#define VBOXUHGSMIKMT_PERTHREAD
+#ifdef VBOXUHGSMIKMT_PERTHREAD
+#define VBOXUHGSMIKMT_VAR(_type) __declspec(thread) _type
+#else
+#define VBOXUHGSMIKMT_VAR(_type) _type
+#endif
+static VBOXUHGSMIKMT_VAR(VBOXUHGSMI_PRIVATE_KMT) g_VBoxUhgsmiKmt;
+static VBOXUHGSMIKMT_VAR(uint32_t) g_cVBoxUhgsmiKmtRefs = 0;
 #endif
 
@@ -5013 +5019 @@
     PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice;
     Assert(pDevice);
+    VBOXDISPCRHGSMI_SCOPE_SET_DEV(pDevice);
     Assert(pResource);
     PVBOXWDDMDISP_ADAPTER pAdapter = pDevice->pAdapter;

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

@@ -58 +58 @@
 
     int rc = vboxUhgsmiBaseLockData(pBuf, offLock, cbLock, fFlags,
-                                         &DdiLock.Flags, pBuffer->aLockPageIndices, &DdiLock.NumPages);
+                                         &DdiLock.Flags, &DdiLock.NumPages, pBuffer->aLockPageIndices);
     AssertRC(rc);
     if (RT_FAILURE(rc))

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

@@ -22 +22 @@
     VBOXUHGSMI_BUFFER_PRIVATE_BASE BasePrivate;
     PVBOXUHGSMI_PRIVATE_KMT pHgsmi;
+    CRITICAL_SECTION CritSect;
     UINT aLockPageIndices[1];
 } VBOXUHGSMI_BUFFER_PRIVATE_KMT, *PVBOXUHGSMI_BUFFER_PRIVATE_KMT;
@@ -55 +56 @@
     DdiLock.PrivateDriverData = NULL;
 
+    EnterCriticalSection(&pBuffer->CritSect);
+
     int rc = vboxUhgsmiBaseLockData(pBuf, offLock, cbLock, fFlags,
-                                         &DdiLock.Flags, pBuffer->aLockPageIndices, &DdiLock.NumPages);
+                                         &DdiLock.Flags, &DdiLock.NumPages, pBuffer->aLockPageIndices);
     AssertRC(rc);
     if (RT_FAILURE(rc))
@@ -65 +68 @@
     NTSTATUS Status = pBuffer->pHgsmi->Callbacks.pfnD3DKMTLock(&DdiLock);
     Assert(!Status);
+    LeaveCriticalSection(&pBuffer->CritSect);
     if (!Status)
     {
@@ -132 +136 @@
         if (hr == S_OK)
         {
+            InitializeCriticalSection(&pBuf->CritSect);
+
             Assert(Buf.DdiAllocInfo.hAllocation);
             pBuf->BasePrivate.Base.pfnLock = vboxUhgsmiKmtBufferLock;