Changeset 69976 in vbox

Timestamp:

Dec 7, 2017 12:48:39 PM (7 years ago)

Author:

vboxsync

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

119482

Message:

WDDM: two new formats for vboxWddmCalcBitsPerPixel; logging; minor cleanups

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• common/wddm/VBoxMPIf.h (modified) (1 diff)
• disp/Makefile.kmk (modified) (1 diff)
• disp/wddm/VBoxD3DIf.h (modified) (1 diff)
• disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -604 +604 @@
         case D3DDDIFMT_R32F:
             return 32;
+        case D3DDDIFMT_G32R32F:
+            return 64;
         case D3DDDIFMT_R16F:
             return 16;
+        case D3DDDIFMT_G16R16F:
+            return 32;
         case D3DDDIFMT_YUY2: /* 4 bytes per 2 pixels. */
         case VBOXWDDM_D3DDDIFORMAT_FROM_FOURCC('Y', 'V', '1', '2'):

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

@@ -206 +206 @@
 DumpD3DCaps9_SOURCES  = \
         wddm/dbg/DumpD3DCaps9.cpp
-DumpD3DCaps9_LIBS     = $(VBOX_LIB_IPRT_GUEST_R3) d3d9.lib
+DumpD3DCaps9_LIBS     = d3d9.lib
 DumpD3DCaps9_LDFLAGS.win = /SUBSYSTEM:CONSOLE
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.h

@@ -40 +40 @@
 void VBoxD3DIfLockUnlockMemSynch(struct VBOXWDDMDISP_ALLOCATION *pAlloc, D3DLOCKED_RECT *pLockInfo, RECT *pRect, bool bToLockInfo);
 
+int vboxD3DIfSetHostId(PVBOXWDDMDISP_ALLOCATION pAlloc, uint32_t hostID, uint32_t *pHostID);
 IUnknown* vboxD3DIfCreateSharedPrimary(PVBOXWDDMDISP_ALLOCATION pAlloc);
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -5487 +5487 @@
 #endif
     hr = pQuery->pQueryIf->GetData(pData->pData, cbData, 0);
-    if (hr != S_OK)
+    if (hr != S_OK && hr != S_FALSE)
         WARN(("GetData failed, hr = 0x%x", hr));
 
+#ifdef DEBUG
+    switch (pQuery->enmType)
+    {
+        case D3DDDIQUERYTYPE_EVENT:
+            vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p) D3DDDIQUERYTYPE_EVENT %d\n", hDevice, *(BOOL *)pData->pData));
+            break;
+        case D3DDDIQUERYTYPE_OCCLUSION:
+            vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p) D3DDDIQUERYTYPE_OCCLUSION %d\n", hDevice, *(UINT *)pData->pData));
+            break;
+        default:
+            break;
+    }
+#endif
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
     return hr;