mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[d3d11] Move D3D10Multithread instance to D3D11CommonContext

This commit is contained in:
Philip Rebohle 2022-08-03 21:24:06 +02:00
parent 9a2d8878ef
commit b20bfe763e
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/d3d11/d3d11_context.cpp
View File

@ -14,7 +14,6 @@ namespace dxvk {
D3D11Device* pParent,
const Rc<DxvkDevice>& Device)
: D3D11DeviceChild<ID3D11DeviceContext4>(pParent),
m_multithread(this, false),
m_device (Device),
m_staging (Device, StagingBufferSize) {

11
src/d3d11/d3d11_context.h
View File

@ -27,27 +27,22 @@ namespace dxvk {
constexpr static VkDeviceSize StagingBufferSize = 4ull << 20;
public:
D3D11DeviceContext(
D3D11Device* pParent,
const Rc<DxvkDevice>& Device);
~D3D11DeviceContext();
D3D10DeviceLock LockContext() {
return m_multithread.AcquireLock();
}
protected:
D3D10Multithread m_multithread;
Rc<DxvkDevice> m_device;
Rc<DxvkDataBuffer> m_updateBuffer;
DxvkStagingBuffer m_staging;
D3D11ContextState m_state;
VkClearValue ConvertColorValue(
const FLOAT Color[4],
const DxvkFormatInfo* pFormatInfo);

1
src/d3d11/d3d11_context_common.cpp
View File

@ -12,6 +12,7 @@ namespace dxvk {
: D3D11DeviceContext(pParent, Device),
m_contextExt(GetTypedContext()),
m_annotation(GetTypedContext(), Device),
m_multithread(this, false),
m_csFlags (CsFlags),
m_csChunk (AllocCsChunk()),
m_cmdData (nullptr) {

5
src/d3d11/d3d11_context_common.h
View File

@ -738,10 +738,15 @@ namespace dxvk {
VkImageLayout OldLayout,
VkImageLayout NewLayout);
D3D10DeviceLock LockContext() {
return m_multithread.AcquireLock();
}
protected:
D3D11DeviceContextExt<ContextType> m_contextExt;
D3D11UserDefinedAnnotation<ContextType> m_annotation;
D3D10Multithread m_multithread;
DxvkCsChunkFlags m_csFlags;
DxvkCsChunkRef m_csChunk;