Reduce d3d11 size

The iostream include adds about 10 MB with mingw-w64-gcc. Also, we don't log much anymore, so there's no need for the mutex.
R2Northstar · Feb 17, 2022 · 24d2974 · 24d2974
1 parent 9e5ade4
commit 24d2974
Show file tree

Hide file tree

Showing 35 changed files with 97 additions and 277 deletions.
diff --git a/src/d3d11/com_guid.cc b/src/d3d11/com_guid.cc
diff --git a/src/d3d11/com_guid.h b/src/d3d11/com_guid.h
diff --git a/src/d3d11/com_object.h b/src/d3d11/com_object.h
@@ -79,37 +79,6 @@ namespace dxvk {
 
   };
 
-  /**
-   * \brief Clamped, reference-counted COM object
-   *
-   * This version of ComObject ensures that the reference
-   * count does not wrap around if a release happens at zero.
-   * eg. [m_refCount = 0]
-   *     Release()
-   *     [m_refCount = 0]
-   * This is a notable quirk of D3D9's COM implementation
-   * and is relied upon by some games.
-   */
-  template<typename Base>
-  class ComObjectClamp : public ComObject<Base> {
-
-  public:
-
-    ULONG STDMETHODCALLTYPE Release() {
-      ULONG refCount = this->m_refCount;
-      if (likely(refCount != 0ul)) {
-        this->m_refCount--;
-        refCount--;
-
-        if (refCount == 0ul)
-          this->ReleasePrivate();
-      }
-
-      return refCount;
-    }
-
-  };
-
   template<typename T>
   inline void InitReturnPtr(T** ptr) {
     if (ptr != nullptr)

diff --git a/src/d3d11/d3d11_blend.cc b/src/d3d11/d3d11_blend.cc
@@ -30,7 +30,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d11/d3d11_buffer.cc b/src/d3d11/d3d11_buffer.cc
@@ -39,7 +39,7 @@ namespace dxvk {
        return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d11/d3d11_class_linkage.cc b/src/d3d11/d3d11_class_linkage.cc
@@ -27,7 +27,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 
@@ -40,7 +40,7 @@ namespace dxvk {
           UINT                SamplerOffset,
           ID3D11ClassInstance **ppInstance) {
     InitReturnPtr(ppInstance);
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -49,7 +49,7 @@ namespace dxvk {
           LPCSTR              pClassInstanceName,
           UINT                InstanceIndex,
           ID3D11ClassInstance **ppInstance) {
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 

diff --git a/src/d3d11/d3d11_cmdlist.cc b/src/d3d11/d3d11_cmdlist.cc
@@ -29,7 +29,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d11/d3d11_context.cc b/src/d3d11/d3d11_context.cc
@@ -37,7 +37,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 
@@ -849,7 +849,7 @@ namespace dxvk {
     auto shader = static_cast<D3D11GeometryShader*>(pShader);
 
     if (NumClassInstances != 0)
-      log("err", "D3D11: Class instances not supported");
+      DXVK_LOG("err", "Class instances not supported");
 
     if (m_state.gs.shader != shader) {
       m_state.gs.shader = shader;

diff --git a/src/d3d11/d3d11_depth_stencil.cc b/src/d3d11/d3d11_depth_stencil.cc
@@ -29,7 +29,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d11/d3d11_device.cc b/src/d3d11/d3d11_device.cc
@@ -723,7 +723,7 @@ namespace dxvk {
     desc.ContextType = D3D11_CONTEXT_TYPE_ALL;
 
     if (desc.Query != D3D11_QUERY_OCCLUSION_PREDICATE) {
-      log("warn", str::format("D3D11: Unhandled predicate type: ", pPredicateDesc->Query));
+      DXVK_LOG("warn", "Unhandled predicate type: %d", pPredicateDesc->Query);
       return E_INVALIDARG;
     }
 
@@ -740,7 +740,7 @@ namespace dxvk {
           ID3D11Counter**             ppCounter) {
     InitReturnPtr(ppCounter);
 
-    log("err", str::format("D3D11: Unsupported counter: ", pCounterDesc->Counter));
+    DXVK_LOG("err", "Unsupported counter: %d", pCounterDesc->Counter);
     return E_INVALIDARG;
   }
 
@@ -823,7 +823,7 @@ namespace dxvk {
           REFIID                      ReturnedInterface,
           void**                      ppFence) {
     InitReturnPtr(ppFence);
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -853,7 +853,7 @@ namespace dxvk {
           REFIID      ReturnedInterface,
           void**      ppResource) {
     InitReturnPtr(ppResource);
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -863,7 +863,7 @@ namespace dxvk {
           REFIID      ReturnedInterface,
           void**      ppResource) {
     InitReturnPtr(ppResource);
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -874,7 +874,7 @@ namespace dxvk {
           REFIID      returnedInterface,
           void**      ppResource) {
     InitReturnPtr(ppResource);
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -884,7 +884,7 @@ namespace dxvk {
           REFIID      ReturnedInterface,
           void**      ppFence) {
     InitReturnPtr(ppFence);
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -1094,7 +1094,7 @@ namespace dxvk {
     if (riid == GUID{0xd56e2a4c,0x5127,0x8437,{0x65,0x8a,0x98,0xc5,0xbb,0x78,0x94,0x98}})
       return E_NOINTERFACE;
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 
@@ -1166,7 +1166,7 @@ namespace dxvk {
 
     // We don't support shared resources
     if (NumSurfaces && pSharedResource)
-      log("err", "D3D11: CreateSurface: Shared surfaces not supported");
+      DXVK_LOG("err", "CreateSurface: Shared surfaces not supported");
 
     // Try to create the given number of surfaces
     uint32_t surfacesCreated = 0;
@@ -1296,7 +1296,7 @@ namespace dxvk {
 
 
   HRESULT STDMETHODCALLTYPE D3D11DXGIDevice::EnqueueSetEvent(HANDLE hEvent) {
-    log("stub", __func__);
+    DXVK_LOG_STUB();
     return DXGI_ERROR_UNSUPPORTED;
   }
 

diff --git a/src/d3d11/d3d11_device_child.h b/src/d3d11/d3d11_device_child.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <atomic>
+
 #include "com_private_data.h"
 #include "d3d11_include.h"
 

diff --git a/src/d3d11/d3d11_include.h b/src/d3d11/d3d11_include.h
@@ -8,15 +8,12 @@
   #define DLLEXPORT __declspec(dllexport)
 #endif
 
-#include "com_guid.h"
 #include "com_object.h"
 #include "com_pointer.h"
 
 #include "log.h"
-
 #include "util_likely.h"
 #include "util_math.h"
-#include "util_string.h"
 
 #include <dxgi1_6.h>
 #include <d3d11_4.h>
diff --git a/src/d3d11/d3d11_input_layout.cc b/src/d3d11/d3d11_input_layout.cc
@@ -26,7 +26,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d11/d3d11_main.cc b/src/d3d11/d3d11_main.cc
@@ -31,7 +31,7 @@ extern "C" {
     }
 
     if (flId == FeatureLevels) {
-      log("err", "D3D11CoreCreateDevice: Requested feature level not supported");
+      DXVK_LOG_FUNC("err", "Requested feature level not supported");
       return E_INVALIDARG;
     }
 
@@ -76,19 +76,19 @@ extern "C" {
       hr = (new DxgiFactory(0))->QueryInterface(__uuidof(IDXGIFactory), reinterpret_cast<void**>(&dxgiFactory));
 
       if (FAILED(hr)) {
-        log("err", "D3D11CreateDevice: Failed to create a DXGI factory");
+        DXVK_LOG_FUNC("err", "Failed to create a DXGI factory");
         return hr;
       }
 
       hr = dxgiFactory->EnumAdapters(0, &dxgiAdapter);
 
       if (FAILED(hr)) {
-        log("err", "D3D11CreateDevice: No default adapter available");
+        DXVK_LOG_FUNC("err", "No default adapter available");
         return hr;
       }
     } else {
       if (FAILED(dxgiAdapter->GetParent(__uuidof(IDXGIFactory), reinterpret_cast<void**>(&dxgiFactory)))) {
-        log("err", "D3D11CreateDevice: Failed to query DXGI factory from DXGI adapter");
+        DXVK_LOG_FUNC("err", "Failed to query DXGI factory from DXGI adapter");
         return E_INVALIDARG;
       }
 
@@ -110,7 +110,7 @@ extern "C" {
       hr = dxgiFactory->CreateSwapChain(device.ptr(), &desc, ppSwapChain);
 
       if (FAILED(hr)) {
-        log("err", "D3D11CreateDevice: Failed to create swap chain");
+        DXVK_LOG_FUNC("err", "Failed to create swap chain");
         return hr;
       }
     }
@@ -146,7 +146,7 @@ extern "C" {
           ID3D11Device**        ppDevice,
           D3D_FEATURE_LEVEL*    pFeatureLevel,
           ID3D11DeviceContext** ppImmediateContext) {
-    dxvk::log("d3d11", "initializing d3d11 stub for northstar (github.com/R2Northstar/NorthstarStubs)");
+    DXVK_LOG("D3D11CreateDevice", "initializing d3d11 stub for northstar (github.com/R2Northstar/NorthstarStubs)");
 
     return D3D11InternalCreateDeviceAndSwapChain(
       pAdapter, DriverType, Software, Flags,

diff --git a/src/d3d11/d3d11_query.cc b/src/d3d11/d3d11_query.cc
@@ -38,8 +38,7 @@ namespace dxvk {
       }
     }
 
-    log("warn", "D3D11Query: Unknown interface query");
-    log("warn", str::format(riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 
@@ -79,7 +78,7 @@ namespace dxvk {
         return sizeof(BOOL);
     }
 
-    log("err", "D3D11Query: Failed to query data size");
+    DXVK_LOG_FUNC("err", "Failed to query data size");
     return 0;
   }
 
@@ -146,7 +145,7 @@ namespace dxvk {
         } return S_OK;
 
         default:
-          log("err", str::format("D3D11: Unhandled query type in GetData: ", m_desc.Query));
+          DXVK_LOG_FUNC("err", "Unhandled query type: %d", m_desc.Query);
           return E_INVALIDARG;
       }
     }

diff --git a/src/d3d11/d3d11_rasterizer.cc b/src/d3d11/d3d11_rasterizer.cc
@@ -31,7 +31,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }
 

diff --git a/src/d3d11/d3d11_resource.cc b/src/d3d11/d3d11_resource.cc
@@ -83,7 +83,7 @@ namespace dxvk {
   HRESULT STDMETHODCALLTYPE D3D11DXGIResource::GetSharedHandle(
           HANDLE*                 pSharedHandle) {
     InitReturnPtr(pSharedHandle);
-    log("err", "D3D11DXGIResource::GetSharedHandle: Stub");
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -133,7 +133,7 @@ namespace dxvk {
           LPCWSTR                 lpName,
           HANDLE*                 pHandle) {
     InitReturnPtr(pHandle);
-    log("err", "D3D11DXGIResource::CreateSharedHandle: Stub");
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 
@@ -142,7 +142,7 @@ namespace dxvk {
           UINT                    index,
           IDXGISurface2**         ppSurface) {
     InitReturnPtr(ppSurface);
-    log("err", "D3D11DXGIResource::CreateSubresourceSurface: Stub");
+    DXVK_LOG_STUB();
     return E_NOTIMPL;
   }
 

diff --git a/src/d3d11/d3d11_sampler.cc b/src/d3d11/d3d11_sampler.cc
@@ -28,7 +28,7 @@ namespace dxvk {
       return S_OK;
     }
 
-    log("warn", str::format(__func__, " Unknown interface query ", riid));
+    DXVK_LOG_UNK_IFACE(riid);
     return E_NOINTERFACE;
   }