From e1610f81dc633917daa92d6a63a83d4e944454a3 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 19 May 2019 13:21:08 +0200 Subject: [PATCH] Revert "[d3d11] Use STDMETHODCALLTYPE for private virtual method" For some reason, this produces broken binaries for some Gentoo users. Fixes #1067. This reverts commit e5fa55cbb5fac2761b1e85e5d8008bf49ecea4c4. --- 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 23fb8f03..4366ca68 100644 --- a/src/d3d11/d3d11_context.h +++ b/src/d3d11/d3d11_context.h @@ -393,7 +393,7 @@ namespace dxvk { UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers); - void STDMETHODCALLTYPE GSSetConstantBuffers1( + virtual void STDMETHODCALLTYPE GSSetConstantBuffers1( UINT StartSlot, UINT NumBuffers, ID3D11Buffer* const* ppConstantBuffers, @@ -862,7 +862,7 @@ namespace dxvk { } } - virtual void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk) = 0; + virtual void EmitCsChunk(DxvkCsChunkRef&& chunk) = 0; }; diff --git a/src/d3d11/d3d11_context_def.cpp b/src/d3d11/d3d11_context_def.cpp index 13d3e9dc..4f1d63d3 100644 --- a/src/d3d11/d3d11_context_def.cpp +++ b/src/d3d11/d3d11_context_def.cpp @@ -320,7 +320,7 @@ namespace dxvk { } - void STDMETHODCALLTYPE D3D11DeferredContext::EmitCsChunk(DxvkCsChunkRef&& chunk) { + void 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 d44cfe3a..a2d5a664 100644 --- a/src/d3d11/d3d11_context_def.h +++ b/src/d3d11/d3d11_context_def.h @@ -101,7 +101,7 @@ namespace dxvk { Com CreateCommandList(); - void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk); + void 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 9572f548..6a6f4701 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -527,6 +527,12 @@ namespace dxvk { return true; } + + + void D3D11ImmediateContext::EmitCsChunk(DxvkCsChunkRef&& chunk) { + m_csThread.dispatchChunk(std::move(chunk)); + m_csIsBusy = true; + } void D3D11ImmediateContext::FlushImplicit(BOOL StrongHint) { @@ -546,10 +552,4 @@ 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 1636e7a0..d1de71a3 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); - }; }