rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-14 22:29:15 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[d3d11] Use STDMETHODCALLTYPE for private virtual method"

Browse Source 
For some reason, this produces broken binaries for some Gentoo
users. Fixes #1067.

This reverts commit e5fa55cbb5fac2761b1e85e5d8008bf49ecea4c4.
This commit is contained in:
Philip Rebohle 2019-05-19 13:21:08 +02:00
parent 664199424b
commit e1610f81dc
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_context.h
View File

@ -393,7 +393,7 @@ namespace dxvk {
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers); ID3D11Buffer* const* ppConstantBuffers);
void STDMETHODCALLTYPE GSSetConstantBuffers1( virtual void STDMETHODCALLTYPE GSSetConstantBuffers1(
UINT StartSlot, UINT StartSlot,
UINT NumBuffers, UINT NumBuffers,
ID3D11Buffer* const* ppConstantBuffers, ID3D11Buffer* const* ppConstantBuffers,
@ -862,7 +862,7 @@ namespace dxvk {
} }
} }
virtual void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk) = 0; virtual void EmitCsChunk(DxvkCsChunkRef&& chunk) = 0;
}; };

2
src/d3d11/d3d11_context_def.cpp
View File

@ -320,7 +320,7 @@ namespace dxvk {
} }
void STDMETHODCALLTYPE D3D11DeferredContext::EmitCsChunk(DxvkCsChunkRef&& chunk) { void D3D11DeferredContext::EmitCsChunk(DxvkCsChunkRef&& chunk) {
m_commandList->AddChunk(std::move(chunk)); m_commandList->AddChunk(std::move(chunk));
} }

2
src/d3d11/d3d11_context_def.h
View File

@ -101,7 +101,7 @@ namespace dxvk {
Com<D3D11CommandList> CreateCommandList(); Com<D3D11CommandList> CreateCommandList();
void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk); void EmitCsChunk(DxvkCsChunkRef&& chunk);
static DxvkCsChunkFlags GetCsChunkFlags( static DxvkCsChunkFlags GetCsChunkFlags(
D3D11Device* pDevice); D3D11Device* pDevice);

12
src/d3d11/d3d11_context_imm.cpp
View File

@ -527,6 +527,12 @@ namespace dxvk {
return true; return true;
} }
void D3D11ImmediateContext::EmitCsChunk(DxvkCsChunkRef&& chunk) {
m_csThread.dispatchChunk(std::move(chunk));
m_csIsBusy = true;
}
void D3D11ImmediateContext::FlushImplicit(BOOL StrongHint) { 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;
}
} }

4
src/d3d11/d3d11_context_imm.h
View File

@ -125,10 +125,10 @@ namespace dxvk {
const Rc<DxvkResource>& Resource, const Rc<DxvkResource>& Resource,
UINT MapFlags); UINT MapFlags);
void EmitCsChunk(DxvkCsChunkRef&& chunk);
void FlushImplicit(BOOL StrongHint); void FlushImplicit(BOOL StrongHint);
void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk);
}; };
} }