[d3d11] Fix reference counting for state objects

Fixes various wine test failures. Also, state objects are now
allocated in the hash map itself rather than a wrapped COM object.

src/d3d11/d3d11_blend.cpp

@@ -36,6 +36,22 @@ namespace dxvk {
   }
   
   
+  ULONG STDMETHODCALLTYPE D3D11BlendState::AddRef() {
+    ULONG refCount = m_refCount++;
+    if (!refCount)
+      m_device->AddRef();
+    return refCount;
+  }
+
+
+  ULONG STDMETHODCALLTYPE D3D11BlendState::Release() {
+    ULONG refCount = --m_refCount;
+    if (!refCount)
+      m_device->Release();
+    return refCount;
+  }
+
+
   HRESULT STDMETHODCALLTYPE D3D11BlendState::QueryInterface(REFIID riid, void** ppvObject) {
     if (ppvObject == nullptr)
       return E_POINTER;

src/d3d11/d3d11_blend.h

@@ -22,6 +22,10 @@ namespace dxvk {
       const D3D11_BLEND_DESC1& desc);
     ~D3D11BlendState();
     
+    ULONG STDMETHODCALLTYPE AddRef() final;
+
+    ULONG STDMETHODCALLTYPE Release() final;
+
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID  riid,
             void**  ppvObject) final;
@@ -61,6 +65,8 @@ namespace dxvk {
     DxvkLogicOpState              m_loState;
 
     D3D10BlendState               m_d3d10;
+
+    std::atomic<uint32_t> m_refCount = { 0u };
     
     static DxvkBlendMode DecodeBlendMode(
       const D3D11_RENDER_TARGET_BLEND_DESC1& BlendDesc);

src/d3d11/d3d11_depth_stencil.cpp

@@ -21,6 +21,22 @@ namespace dxvk {
   }
   
   
+  ULONG STDMETHODCALLTYPE D3D11DepthStencilState::AddRef() {
+    ULONG refCount = m_refCount++;
+    if (!refCount)
+      m_device->AddRef();
+    return refCount;
+  }
+
+
+  ULONG STDMETHODCALLTYPE D3D11DepthStencilState::Release() {
+    ULONG refCount = --m_refCount;
+    if (!refCount)
+      m_device->Release();
+    return refCount;
+  }
+
+
   HRESULT STDMETHODCALLTYPE D3D11DepthStencilState::QueryInterface(REFIID riid, void** ppvObject) {
     if (ppvObject == nullptr)
       return E_POINTER;

src/d3d11/d3d11_depth_stencil.h

@@ -22,6 +22,10 @@ namespace dxvk {
       const D3D11_DEPTH_STENCIL_DESC& desc);
     ~D3D11DepthStencilState();
     
+    ULONG STDMETHODCALLTYPE AddRef() final;
+
+    ULONG STDMETHODCALLTYPE Release() final;
+
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID  riid,
             void**  ppvObject) final;
@@ -50,6 +54,8 @@ namespace dxvk {
     D3D11_DEPTH_STENCIL_DESC  m_desc;
     DxvkDepthStencilState     m_state;
     D3D10DepthStencilState    m_d3d10;
+
+    std::atomic<uint32_t> m_refCount = { 0u };
     
     VkStencilOpState DecodeStencilOpState(
       const D3D11_DEPTH_STENCILOP_DESC& StencilDesc,

src/d3d11/d3d11_rasterizer.cpp

@@ -50,6 +50,22 @@ namespace dxvk {
   }
   
   
+  ULONG STDMETHODCALLTYPE D3D11RasterizerState::AddRef() {
+    ULONG refCount = m_refCount++;
+    if (!refCount)
+      m_device->AddRef();
+    return refCount;
+  }
+
+
+  ULONG STDMETHODCALLTYPE D3D11RasterizerState::Release() {
+    ULONG refCount = --m_refCount;
+    if (!refCount)
+      m_device->Release();
+    return refCount;
+  }
+
+
   HRESULT STDMETHODCALLTYPE D3D11RasterizerState::QueryInterface(REFIID riid, void** ppvObject) {
     if (ppvObject == nullptr)
       return E_POINTER;

src/d3d11/d3d11_rasterizer.h

@@ -20,7 +20,11 @@ namespace dxvk {
             D3D11Device*                    device,
       const D3D11_RASTERIZER_DESC2&         desc);
     ~D3D11RasterizerState();
-    
+
+    ULONG STDMETHODCALLTYPE AddRef() final;
+
+    ULONG STDMETHODCALLTYPE Release() final;
+
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID  riid,
             void**  ppvObject) final;
@@ -66,6 +70,8 @@ namespace dxvk {
     DxvkRasterizerState    m_state;
     DxvkDepthBias          m_depthBias;
     D3D10RasterizerState   m_d3d10;
+
+    std::atomic<uint32_t> m_refCount = { 0u };
     
   };
   

src/d3d11/d3d11_sampler.cpp

@@ -59,6 +59,22 @@ namespace dxvk {
   }
   
   
+  ULONG STDMETHODCALLTYPE D3D11SamplerState::AddRef() {
+    ULONG refCount = m_refCount++;
+    if (!refCount)
+      m_device->AddRef();
+    return refCount;
+  }
+
+
+  ULONG STDMETHODCALLTYPE D3D11SamplerState::Release() {
+    ULONG refCount = --m_refCount;
+    if (!refCount)
+      m_device->Release();
+    return refCount;
+  }
+
+
   HRESULT STDMETHODCALLTYPE D3D11SamplerState::QueryInterface(REFIID riid, void** ppvObject) {
     if (ppvObject == nullptr)
       return E_POINTER;

src/d3d11/d3d11_sampler.h

@@ -21,6 +21,10 @@ namespace dxvk {
       const D3D11_SAMPLER_DESC& desc);
     ~D3D11SamplerState();
     
+    ULONG STDMETHODCALLTYPE AddRef() final;
+
+    ULONG STDMETHODCALLTYPE Release() final;
+
     HRESULT STDMETHODCALLTYPE QueryInterface(
             REFIID  riid,
             void**  ppvObject) final;
@@ -49,6 +53,8 @@ namespace dxvk {
     Rc<DxvkSampler>    m_sampler;
     D3D10SamplerState  m_d3d10;
 
+    std::atomic<uint32_t> m_refCount = { 0u };
+
     static bool ValidateAddressMode(
             D3D11_TEXTURE_ADDRESS_MODE  Mode);
 

src/d3d11/d3d11_state.h

@@ -56,20 +56,22 @@ namespace dxvk {
     T* Create(D3D11Device* device, const DescType& desc) {
       std::lock_guard<std::mutex> lock(m_mutex);
       
-      auto pair = m_objects.find(desc);
+      auto entry = m_objects.find(desc);
       
-      if (pair != m_objects.end())
+      if (entry != m_objects.end())
-        return pair->second.ref();
+        return ref(&entry->second);
       
-      Com<T> result = new T(device, desc);
+      auto result = m_objects.emplace(
-      m_objects.insert({ desc, result });
+        std::piecewise_construct,
-      return result.ref();
+        std::tuple(desc),
+        std::tuple(device, desc));
+      return ref(&result.first->second);
     }
     
   private:
     
     std::mutex                                 m_mutex;
-    std::unordered_map<DescType, Com<T>,
+    std::unordered_map<DescType, T,
       D3D11StateDescHash, D3D11StateDescEqual> m_objects;
     
   };