From e5fa55cbb5fac2761b1e85e5d8008bf49ecea4c4 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 15 May 2019 21:57:05 +0200 Subject: [PATCH] [d3d11] Use STDMETHODCALLTYPE for private virtual method Improves code generation on some compilers. --- src/d3d11/d3d11_context.h | 4 ++-- src/d3d11/d3d11_context_def.cpp | 2 +- src/d3d11/d3d11_context_def.h | 2 +- src/d3d11/d3d11_context_imm.cpp | 12 ++++++------ src/d3d11/d3d11_context_imm.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/d3d11/d3d11_context.h b/src/d3d11/d3d11_context.h index b7893abb..8a115637 100644 --- a/src/d3d11/d3d11_context.h +++ b/src/d3d11/d3d11_context.h @@ -393,7 +393,7 @@ namespace dxvk { UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers); - virtual void STDMETHODCALLTYPE GSSetConstantBuffers1( + void STDMETHODCALLTYPE GSSetConstantBuffers1( UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, @@ -858,7 +858,7 @@ namespace dxvk { } } - virtual void EmitCsChunk(DxvkCsChunkRef&& chunk) = 0; + virtual void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk) = 0; }; diff --git a/src/d3d11/d3d11_context_def.cpp b/src/d3d11/d3d11_context_def.cpp index 4f1d63d3..13d3e9dc 100644 --- a/src/d3d11/d3d11_context_def.cpp +++ b/src/d3d11/d3d11_context_def.cpp @@ -320,7 +320,7 @@ namespace dxvk { } - void D3D11DeferredContext::EmitCsChunk(DxvkCsChunkRef&& chunk) { + void STDMETHODCALLTYPE D3D11DeferredContext::EmitCsChunk(DxvkCsChunkRef&& chunk) { m_commandList->AddChunk(std::move(chunk)); } diff --git a/src/d3d11/d3d11_context_def.h b/src/d3d11/d3d11_context_def.h index a2d5a664..d44cfe3a 100644 --- a/src/d3d11/d3d11_context_def.h +++ b/src/d3d11/d3d11_context_def.h @@ -101,7 +101,7 @@ namespace dxvk { Com CreateCommandList(); - void EmitCsChunk(DxvkCsChunkRef&& chunk); + void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk); static DxvkCsChunkFlags GetCsChunkFlags( D3D11Device* pDevice); diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 8db91b16..65065e38 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -543,12 +543,6 @@ namespace dxvk { return true; } - - - void D3D11ImmediateContext::EmitCsChunk(DxvkCsChunkRef&& chunk) { - m_csThread.dispatchChunk(std::move(chunk)); - m_csIsBusy = true; - } void D3D11ImmediateContext::FlushImplicit(BOOL StrongHint) { @@ -568,4 +562,10 @@ namespace dxvk { } } + + void STDMETHODCALLTYPE D3D11ImmediateContext::EmitCsChunk(DxvkCsChunkRef&& chunk) { + m_csThread.dispatchChunk(std::move(chunk)); + m_csIsBusy = true; + } + } diff --git a/src/d3d11/d3d11_context_imm.h b/src/d3d11/d3d11_context_imm.h index d1de71a3..1636e7a0 100644 --- a/src/d3d11/d3d11_context_imm.h +++ b/src/d3d11/d3d11_context_imm.h @@ -125,10 +125,10 @@ namespace dxvk { const Rc& Resource, UINT MapFlags); - void EmitCsChunk(DxvkCsChunkRef&& chunk); - void FlushImplicit(BOOL StrongHint); + void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk); + }; }