Changeset 94272 in vbox for trunk

Timestamp:

Mar 16, 2022 2:58:00 PM (3 years ago)

Author:

vboxsync

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

150531

Message:

Devices/Graphics: fixes for Linux host; log 3D adapter name: bugref:9830

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp ¶

@@ -806 +806 @@
         }
         else
-            AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
+        {
+            LogFunc(("CheckFormatSupport failed for 0x%08x, hr = 0x%08x\n", dxgiFormat, hr));
+            rc = VERR_NOT_SUPPORTED;
+        }
     }
     else
@@ -2062 +2065 @@
         }
 
-        if (SUCCEEDED(hr))
+        if (   SUCCEEDED(hr)
+            && MiscFlags == D3D11_RESOURCE_MISC_SHARED)
         {
             /* Get the shared handle. */
@@ -2742 +2746 @@
         /* Failure to load the shader disassembler is ignored. */
         int rc2 = RTLdrLoadSystem("D3DCompiler_47", /* fNoUnload = */ true, &pBackend->hD3DCompiler);
-        AssertRC(rc2);
         if (RT_SUCCESS(rc2))
-        {
             rc2 = RTLdrGetSymbol(pBackend->hD3DCompiler, "D3DDisassemble", (void **)&pBackend->pfnD3DDisassemble);
-            AssertRC(rc2);
-        }
         Log6Func(("Load D3DDisassemble: %Rrc\n", rc2));
     }
@@ -2773 +2773 @@
 
     int rc = dxDeviceCreate(pBackend, &pBackend->dxDevice);
+    if (RT_SUCCESS(rc))
+    {
+        IDXGIAdapter *pAdapter = NULL; 
+        HRESULT hr = pBackend->dxDevice.pDxgiFactory->EnumAdapters(0, &pAdapter);
+        if (SUCCEEDED(hr))
+        {
+            DXGI_ADAPTER_DESC desc;
+            hr = pAdapter->GetDesc(&desc);
+            if (SUCCEEDED(hr))
+            {
+                char sz[RT_ELEMENTS(desc.Description)];
+                for (unsigned i = 0; i < RT_ELEMENTS(desc.Description); ++i)
+                    sz[i] = (char)desc.Description[i];
+                LogRelMax(1, ("VMSVGA: Adapter [%s]\n", sz));
+            }
+
+            pAdapter->Release();
+        }
+    }
     return rc;
 }