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

Timestamp:

Sep 22, 2010 12:57:00 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: make winsat more happy

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispD3D.cpp (modified) (3 diffs)
• Display/wddm/VBoxDispD3D.h (modified) (1 diff)
• Miniport/wddm/VBoxVideoWddm.cpp (modified) (1 diff)

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

@@ -629 +629 @@
 static D3DDDIQUERYTYPE gVBoxQueryTypes[] = {
         D3DDDIQUERYTYPE_EVENT,
-        D3DDDIQUERYTYPE_OCCLUSION
+//        D3DDDIQUERYTYPE_OCCLUSION
 };
 
@@ -3765 +3765 @@
 {
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    Assert(0);
-    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    return E_FAIL;
+    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
+    return S_OK;
 }
 AssertCompile(sizeof (RECT) == sizeof (D3DRECT));
@@ -6051 +6050 @@
 static HRESULT APIENTRY vboxWddmDDevCreateQuery(HANDLE hDevice, D3DDDIARG_CREATEQUERY* pData)
 {
+    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
+    HRESULT hr = S_OK;
+    if (pData->QueryType == D3DDDIQUERYTYPE_EVENT)
+    {
+        PVBOXWDDMDISP_QUERY pQuery = (PVBOXWDDMDISP_QUERY)RTMemAllocZ(sizeof (VBOXWDDMDISP_QUERY));
+        Assert(pQuery);
+        if (pQuery)
+        {
+            pQuery->enmType = pData->QueryType;
+            pData->hQuery = pQuery;
+        }
+        else
+        {
+            hr = E_OUTOFMEMORY;
+        }
+    }
+    else
+    {
+        Assert(0);
+        hr = E_FAIL;
+    }
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    Assert(0);
-    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    return E_FAIL;
+    return hr;
 }
 static HRESULT APIENTRY vboxWddmDDevDestroyQuery(HANDLE hDevice, HANDLE hQuery)
 {
+    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
+    HRESULT hr = S_OK;
+    PVBOXWDDMDISP_QUERY pQuery = (PVBOXWDDMDISP_QUERY)hQuery;
+    Assert(pQuery);
+    RTMemFree(pQuery);
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    Assert(0);
-    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    return E_FAIL;
+    return hr;
 }
 static HRESULT APIENTRY vboxWddmDDevIssueQuery(HANDLE hDevice, CONST D3DDDIARG_ISSUEQUERY* pData)
 {
+    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
+    HRESULT hr = S_OK;
+    PVBOXWDDMDISP_QUERY pQuery = (PVBOXWDDMDISP_QUERY)pData->hQuery;
+    Assert(pQuery);
+    pQuery->fQueryState.Value |= pData->Flags.Value;
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    Assert(0);
-    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    return E_FAIL;
+    return hr;
 }
 static HRESULT APIENTRY vboxWddmDDevGetQueryData(HANDLE hDevice, CONST D3DDDIARG_GETQUERYDATA* pData)
 {
+    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
+    HRESULT hr = S_OK;
+    PVBOXWDDMDISP_QUERY pQuery = (PVBOXWDDMDISP_QUERY)pData->hQuery;
+    Assert(pQuery);
+    switch (pQuery->enmType)
+    {
+        case D3DDDIQUERYTYPE_EVENT:
+            Assert(0);
+            pQuery->data.bData = TRUE;
+            Assert(pData->pData);
+            *((BOOL*)pData->pData) = TRUE;
+            break;
+        default:
+            Assert(0);
+            hr = E_FAIL;
+            break;
+    }
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    Assert(0);
-    vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
-    return E_FAIL;
+    return hr;
 }
 static HRESULT APIENTRY vboxWddmDDevSetRenderTarget(HANDLE hDevice, CONST D3DDDIARG_SETRENDERTARGET* pData)

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

@@ -236 +236 @@
 } VBOXWDDMDISP_RESOURCE, *PVBOXWDDMDISP_RESOURCE;
 
+typedef struct VBOXWDDMDISP_QUERY
+{
+    D3DDDIQUERYTYPE enmType;
+    D3DDDI_ISSUEQUERYFLAGS fQueryState;
+    union
+    {
+        BOOL bData;
+        UINT u32Data;
+    } data ;
+} VBOXWDDMDISP_QUERY, *PVBOXWDDMDISP_QUERY;
+
 typedef struct VBOXWDDMDISP_TSS_LOOKUP
 {

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

@@ -193 +193 @@
         return STATUS_INVALID_PARAMETER;
 
-    Assert(0);
     /*
      * Set the current mode into the hardware.