Changeset 93299 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp

Timestamp:

Jan 18, 2022 11:23:59 AM (3 years ago)

Author:

vboxsync

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

149367

Message:

Add/win: VC++ 19.2 update 11 build adjustments. bugref:8489

Location:

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

Files:

• gallium/GaDxva.cpp (modified) (1 diff)
• shared/VBoxDispKmt.cpp (modified) (1 diff)
• shared/VBoxDispMpLogger.cpp (modified) (1 diff)

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

@@ -597 +597 @@
     AssertReturn(pSrcRect->bottom > pSrcRect->top, S_OK);
 
-    float const cSrcWidth = pVideoProcessDevice->VideoDesc.SampleWidth;
+    float const cSrcWidth  = pVideoProcessDevice->VideoDesc.SampleWidth;
     float const cSrcHeight = pVideoProcessDevice->VideoDesc.SampleHeight;
 
-    float const uSrcLeft   = pSrcRect->left/cSrcWidth;
-    float const uSrcRight  = pSrcRect->right/cSrcWidth;
-    float const vSrcTop    = pSrcRect->top/cSrcHeight;
-    float const vSrcBottom = pSrcRect->bottom/cSrcHeight;
+    float const uSrcLeft   = (float)pSrcRect->left   / cSrcWidth;
+    float const uSrcRight  = (float)pSrcRect->right  / cSrcWidth;
+    float const vSrcTop    = (float)pSrcRect->top    / cSrcHeight;
+    float const vSrcBottom = (float)pSrcRect->bottom / cSrcHeight;
 
     /* Subtract 0.5 to line up the pixel centers with texels
      * https://docs.microsoft.com/en-us/windows/win32/direct3d9/directly-mapping-texels-to-pixels
      */
-    float const xDstLeft   = pDstRect->left - 0.5f;
-    float const xDstRight  = pDstRect->right - 0.5f;
-    float const yDstTop    = pDstRect->top - 0.5f;
-    float const yDstBottom = pDstRect->bottom - 0.5f;
+    float const xDstLeft   = (float)pDstRect->left   - 0.5f;
+    float const xDstRight  = (float)pDstRect->right  - 0.5f;
+    float const yDstTop    = (float)pDstRect->top    - 0.5f;
+    float const yDstBottom = (float)pDstRect->bottom - 0.5f;
 
     Vertex const aVertices[] =

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

@@ -272 +272 @@
             if (f || EnumAdapters.Adapters[i].NumOfSources)
             {
-                D3DKMT_OPENADAPTERFROMLUID OpenAdapterData = {0};
+                D3DKMT_OPENADAPTERFROMLUID OpenAdapterData = {{0}};
                 OpenAdapterData.AdapterLuid = EnumAdapters.Adapters[i].AdapterLuid;
                 Status = pCallbacks->pfnD3DKMTOpenAdapterFromLuid(&OpenAdapterData);
-    #ifdef DEBUG_misha
+#ifdef DEBUG_misha
                 Assert(!Status);
-    #endif
+#endif
                 if (NT_SUCCESS(Status))
                 {

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

@@ -52 +52 @@
 } VBOXDISPMPLOGGER, *PVBOXDISPMPLOGGER;
 
-static VBOXDISPMPLOGGER g_VBoxDispMpLogger = {0};
+static VBOXDISPMPLOGGER g_VBoxDispMpLogger = { {0}, VBOXDISPMPLOGGER_STATE_UNINITIALIZED };
 
 static PVBOXDISPMPLOGGER vboxDispMpLoggerGet()