From d314bee86d17967c9f4ffe2de1ad6d32b2760d2d Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 7 Aug 2022 14:47:07 +0200 Subject: [PATCH] [d3d11] Fix bad signature of various BindToContext methods --- src/d3d11/d3d11_blend.cpp | 2 +- src/d3d11/d3d11_blend.h | 2 +- src/d3d11/d3d11_depth_stencil.cpp | 2 +- src/d3d11/d3d11_depth_stencil.h | 3 +-- src/d3d11/d3d11_input_layout.cpp | 2 +- src/d3d11/d3d11_input_layout.h | 3 +-- src/d3d11/d3d11_rasterizer.cpp | 2 +- src/d3d11/d3d11_rasterizer.h | 3 +-- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/d3d11/d3d11_blend.cpp b/src/d3d11/d3d11_blend.cpp index caacc869e..38752b691 100644 --- a/src/d3d11/d3d11_blend.cpp +++ b/src/d3d11/d3d11_blend.cpp @@ -87,7 +87,7 @@ namespace dxvk { void D3D11BlendState::BindToContext( - const Rc& ctx, + DxvkContext* ctx, uint32_t sampleMask) const { // We handled Independent Blend during object creation // already, so if it is disabled, all elements in the diff --git a/src/d3d11/d3d11_blend.h b/src/d3d11/d3d11_blend.h index 5761d3ca7..a5546c6e9 100644 --- a/src/d3d11/d3d11_blend.h +++ b/src/d3d11/d3d11_blend.h @@ -33,7 +33,7 @@ namespace dxvk { D3D11_BLEND_DESC1* pDesc) final; void BindToContext( - const Rc& ctx, + DxvkContext* ctx, UINT sampleMask) const; D3D10BlendState* GetD3D10Iface() { diff --git a/src/d3d11/d3d11_depth_stencil.cpp b/src/d3d11/d3d11_depth_stencil.cpp index b095e5eac..ded08d02c 100644 --- a/src/d3d11/d3d11_depth_stencil.cpp +++ b/src/d3d11/d3d11_depth_stencil.cpp @@ -52,7 +52,7 @@ namespace dxvk { } - void D3D11DepthStencilState::BindToContext(const Rc& ctx) { + void D3D11DepthStencilState::BindToContext(DxvkContext* ctx) { ctx->setDepthStencilState(m_state); } diff --git a/src/d3d11/d3d11_depth_stencil.h b/src/d3d11/d3d11_depth_stencil.h index 6311259f4..5cc1dba86 100644 --- a/src/d3d11/d3d11_depth_stencil.h +++ b/src/d3d11/d3d11_depth_stencil.h @@ -29,8 +29,7 @@ namespace dxvk { void STDMETHODCALLTYPE GetDesc( D3D11_DEPTH_STENCIL_DESC* pDesc) final; - void BindToContext( - const Rc& ctx); + void BindToContext(DxvkContext* ctx); D3D10DepthStencilState* GetD3D10Iface() { return &m_d3d10; diff --git a/src/d3d11/d3d11_input_layout.cpp b/src/d3d11/d3d11_input_layout.cpp index abf3d125b..257e38a79 100644 --- a/src/d3d11/d3d11_input_layout.cpp +++ b/src/d3d11/d3d11_input_layout.cpp @@ -52,7 +52,7 @@ namespace dxvk { } - void D3D11InputLayout::BindToContext(const Rc& ctx) { + void D3D11InputLayout::BindToContext(DxvkContext* ctx) { ctx->setInputLayout( m_attributes.size(), m_attributes.data(), diff --git a/src/d3d11/d3d11_input_layout.h b/src/d3d11/d3d11_input_layout.h index 8e472e2eb..e761c647e 100644 --- a/src/d3d11/d3d11_input_layout.h +++ b/src/d3d11/d3d11_input_layout.h @@ -25,8 +25,7 @@ namespace dxvk { REFIID riid, void** ppvObject) final; - void BindToContext( - const Rc& ctx); + void BindToContext(DxvkContext* ctx); bool Compare( const D3D11InputLayout* pOther) const; diff --git a/src/d3d11/d3d11_rasterizer.cpp b/src/d3d11/d3d11_rasterizer.cpp index 6d70847e4..8d8ba1c2e 100644 --- a/src/d3d11/d3d11_rasterizer.cpp +++ b/src/d3d11/d3d11_rasterizer.cpp @@ -113,7 +113,7 @@ namespace dxvk { } - void D3D11RasterizerState::BindToContext(const Rc& ctx) { + void D3D11RasterizerState::BindToContext(DxvkContext* ctx) { ctx->setRasterizerState(m_state); if (m_state.depthBiasEnable) diff --git a/src/d3d11/d3d11_rasterizer.h b/src/d3d11/d3d11_rasterizer.h index 7b542f2ca..b72e0299f 100644 --- a/src/d3d11/d3d11_rasterizer.h +++ b/src/d3d11/d3d11_rasterizer.h @@ -38,8 +38,7 @@ namespace dxvk { return &m_desc; } - void BindToContext( - const Rc& ctx); + void BindToContext(DxvkContext* ctx); D3D10RasterizerState* GetD3D10Iface() { return &m_d3d10;