mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-03-13 19:29:14 +01:00
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.
This commit is contained in:
parent
664199424b
commit
e1610f81dc
@ -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;
|
||||
|
||||
};
|
||||
|
||||
|
@ -320,7 +320,7 @@ namespace dxvk {
|
||||
}
|
||||
|
||||
|
||||
void STDMETHODCALLTYPE D3D11DeferredContext::EmitCsChunk(DxvkCsChunkRef&& chunk) {
|
||||
void D3D11DeferredContext::EmitCsChunk(DxvkCsChunkRef&& chunk) {
|
||||
m_commandList->AddChunk(std::move(chunk));
|
||||
}
|
||||
|
||||
|
@ -101,7 +101,7 @@ namespace dxvk {
|
||||
|
||||
Com<D3D11CommandList> CreateCommandList();
|
||||
|
||||
void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk);
|
||||
void EmitCsChunk(DxvkCsChunkRef&& chunk);
|
||||
|
||||
static DxvkCsChunkFlags GetCsChunkFlags(
|
||||
D3D11Device* pDevice);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -125,10 +125,10 @@ namespace dxvk {
|
||||
const Rc<DxvkResource>& Resource,
|
||||
UINT MapFlags);
|
||||
|
||||
void EmitCsChunk(DxvkCsChunkRef&& chunk);
|
||||
|
||||
void FlushImplicit(BOOL StrongHint);
|
||||
|
||||
void STDMETHODCALLTYPE EmitCsChunk(DxvkCsChunkRef&& chunk);
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user