Changeset 108118 in vbox

Timestamp:

Feb 7, 2025 3:33:20 PM (6 weeks ago)

Author:

vboxsync

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

167416

Message:

libs/dxvk-2.3.1: Avoid RTTI on Windows

Location:

trunk/src/libs/dxvk-2.3.1

Files:

• Makefile.kmk (modified) (1 diff)
• src/d3d11/d3d11_context.cpp (modified) (2 diffs)

trunk/src/libs/dxvk-2.3.1/Makefile.kmk

@@ -41 +41 @@
 ifeq ($(KBUILD_TARGET),win)
  VBOX_DXVK_PLATFORM = DXVK_PLATFORM_WINDOWS
- VBOX_DXVK_CXXFLAGS_WIN = -GR # DXVK uses RTTI
- VBOX_DXVK_CXXFLAGS_WIN += -wd4101 # 'e': unreferenced local variable
+ VBOX_DXVK_CXXFLAGS_WIN  = -wd4101 # 'e': unreferenced local variable
  VBOX_DXVK_CXXFLAGS_WIN += -wd4146 # unary minus operator applied to unsigned type, result still unsigned
  VBOX_DXVK_CXXFLAGS_WIN += -wd4265 # 'dxvk::DxgiMonitorInfo': class has virtual functions, but its non-trivial destructor is not virtual; instances of this class may not be destructed correctly

trunk/src/libs/dxvk-2.3.1/src/d3d11/d3d11_context.cpp

@@ -135 +135 @@
     // ID3D11View has no methods to query the exact type of
     // the view, so we'll have to check each possible class
+#if defined(VBOX) && defined(RT_OS_WINDOWS)
+    // Avoid RTTI/dynamic_cast
+    D3D11DepthStencilView* dsv = nullptr;
+    ID3D11DepthStencilView* pDSV;
+    if (SUCCEEDED(pResourceView->QueryInterface(__uuidof(ID3D11DepthStencilView), reinterpret_cast<void**>(&pDSV))))
+      dsv = reinterpret_cast<D3D11DepthStencilView*>(pDSV);
+
+    D3D11RenderTargetView* rtv = nullptr;
+    ID3D11RenderTargetView* pRTV;
+    if (SUCCEEDED(pResourceView->QueryInterface(__uuidof(ID3D11RenderTargetView), reinterpret_cast<void**>(&pRTV))))
+      rtv = reinterpret_cast<D3D11RenderTargetView*>(pRTV);
+
+    D3D11UnorderedAccessView* uav = nullptr;
+    ID3D11UnorderedAccessView* pUAV;
+    if (SUCCEEDED(pResourceView->QueryInterface(__uuidof(ID3D11UnorderedAccessView), reinterpret_cast<void**>(&pUAV))))
+      uav = reinterpret_cast<D3D11UnorderedAccessView*>(pUAV);
+#else
     auto dsv = dynamic_cast<D3D11DepthStencilView*>(pResourceView);
     auto rtv = dynamic_cast<D3D11RenderTargetView*>(pResourceView);
     auto uav = dynamic_cast<D3D11UnorderedAccessView*>(pResourceView);
+#endif
 
     Rc<DxvkImageView> view;
@@ -668 +686 @@
     // ID3D11View has no methods to query the exact type of
     // the view, so we'll have to check each possible class
+#if defined(VBOX) && defined(RT_OS_WINDOWS)
+    // Avoid RTTI/dynamic_cast
+    D3D11DepthStencilView* dsv = nullptr;
+    ID3D11DepthStencilView* pDSV;
+    if (SUCCEEDED(pView->QueryInterface(__uuidof(ID3D11DepthStencilView), reinterpret_cast<void**>(&pDSV))))
+      dsv = reinterpret_cast<D3D11DepthStencilView*>(pDSV);
+
+    D3D11RenderTargetView* rtv = nullptr;
+    ID3D11RenderTargetView* pRTV;
+    if (SUCCEEDED(pView->QueryInterface(__uuidof(ID3D11RenderTargetView), reinterpret_cast<void**>(&pRTV))))
+      rtv = reinterpret_cast<D3D11RenderTargetView*>(pRTV);
+
+    D3D11UnorderedAccessView* uav = nullptr;
+    ID3D11UnorderedAccessView* pUAV;
+    if (SUCCEEDED(pView->QueryInterface(__uuidof(ID3D11UnorderedAccessView), reinterpret_cast<void**>(&pUAV))))
+      uav = reinterpret_cast<D3D11UnorderedAccessView*>(pUAV);
+
+    D3D11VideoProcessorOutputView* vov = nullptr;
+    ID3D11VideoProcessorOutputView* pVPOV;
+    if (SUCCEEDED(pView->QueryInterface(__uuidof(ID3D11VideoProcessorOutputView), reinterpret_cast<void**>(&pVPOV))))
+      vov = reinterpret_cast<D3D11VideoProcessorOutputView*>(pVPOV);
+#else
     auto dsv = dynamic_cast<D3D11DepthStencilView*>(pView);
     auto rtv = dynamic_cast<D3D11RenderTargetView*>(pView);
     auto uav = dynamic_cast<D3D11UnorderedAccessView*>(pView);
     auto vov = dynamic_cast<D3D11VideoProcessorOutputView*>(pView);
+#endif
 
     // Retrieve underlying resource view