rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-19 05:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Allocate xfb counter buffer per buffer

Browse Source 
Same idea as with UAV counters, allows for more efficient updates.
This commit is contained in:
Philip Rebohle 2019-10-26 15:46:40 +02:00
parent 191c9644af
commit 09f507c284
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/d3d11/d3d11_buffer.cpp
View File

@ -76,13 +76,12 @@ namespace dxvk {
// For Stream Output buffers we need a counter // For Stream Output buffers we need a counter
if (pDesc->BindFlags & D3D11_BIND_STREAM_OUTPUT) if (pDesc->BindFlags & D3D11_BIND_STREAM_OUTPUT)
m_soCounter = m_device->AllocXfbCounterSlice(); m_soCounter = CreateSoCounterBuffer();
} }
D3D11Buffer::~D3D11Buffer() { D3D11Buffer::~D3D11Buffer() {
if (m_soCounter.defined())
m_device->FreeXfbCounterSlice(m_soCounter);
} }
@ -257,6 +256,27 @@ namespace dxvk {
} }
Rc<DxvkBuffer> D3D11Buffer::CreateSoCounterBuffer() {
Rc<DxvkDevice> device = m_device->GetDXVKDevice();
DxvkBufferCreateInfo info;
info.size = sizeof(D3D11SOCounter);
info.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT
| VK_BUFFER_USAGE_TRANSFER_SRC_BIT
| VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT
| VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT;
info.stages = VK_PIPELINE_STAGE_TRANSFER_BIT
| VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT
| VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT;
info.access = VK_ACCESS_TRANSFER_READ_BIT
| VK_ACCESS_TRANSFER_WRITE_BIT
| VK_ACCESS_INDIRECT_COMMAND_READ_BIT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT;
return device->createBuffer(info, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
}
D3D11Buffer* GetCommonBuffer(ID3D11Resource* pResource) { D3D11Buffer* GetCommonBuffer(ID3D11Resource* pResource) {
D3D11_RESOURCE_DIMENSION dimension = D3D11_RESOURCE_DIMENSION_UNKNOWN; D3D11_RESOURCE_DIMENSION dimension = D3D11_RESOURCE_DIMENSION_UNKNOWN;
pResource->GetType(&dimension); pResource->GetType(&dimension);

8
src/d3d11/d3d11_buffer.h
View File

@ -92,7 +92,9 @@ namespace dxvk {
} }
DxvkBufferSlice GetSOCounter() { DxvkBufferSlice GetSOCounter() {
return m_soCounter; return m_soCounter != nullptr
? DxvkBufferSlice(m_soCounter)
: DxvkBufferSlice();
} }
DxvkBufferSliceHandle AllocSlice() { DxvkBufferSliceHandle AllocSlice() {
@ -127,7 +129,7 @@ namespace dxvk {
const D3D11_BUFFER_DESC m_desc; const D3D11_BUFFER_DESC m_desc;
Rc<DxvkBuffer> m_buffer; Rc<DxvkBuffer> m_buffer;
DxvkBufferSlice m_soCounter; Rc<DxvkBuffer> m_soCounter;
DxvkBufferSliceHandle m_mapped; DxvkBufferSliceHandle m_mapped;
D3D11DXGIResource m_resource; D3D11DXGIResource m_resource;
@ -139,6 +141,8 @@ namespace dxvk {
VkMemoryPropertyFlags GetMemoryFlags() const; VkMemoryPropertyFlags GetMemoryFlags() const;
Rc<DxvkBuffer> CreateSoCounterBuffer();
}; };

22
src/d3d11/d3d11_device.cpp
View File

@ -45,7 +45,6 @@ namespace dxvk {
m_context = new D3D11ImmediateContext(this, m_dxvkDevice); m_context = new D3D11ImmediateContext(this, m_dxvkDevice);
m_d3d10Device = new D3D10Device(this, m_context); m_d3d10Device = new D3D10Device(this, m_context);
m_xfbCounters = CreateXFBCounterBuffer();
m_predicates = CreatePredicateBuffer(); m_predicates = CreatePredicateBuffer();
} }
@ -1969,27 +1968,6 @@ namespace dxvk {
} }
Rc<D3D11CounterBuffer> D3D11Device::CreateXFBCounterBuffer() {
DxvkBufferCreateInfo xfbCounterInfo;
xfbCounterInfo.size = 4096 * sizeof(D3D11SOCounter);
xfbCounterInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT
| VK_BUFFER_USAGE_TRANSFER_SRC_BIT
| VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT
| VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT;
xfbCounterInfo.stages = VK_PIPELINE_STAGE_TRANSFER_BIT
| VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT
| VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT;
xfbCounterInfo.access = VK_ACCESS_TRANSFER_READ_BIT
| VK_ACCESS_TRANSFER_WRITE_BIT
| VK_ACCESS_INDIRECT_COMMAND_READ_BIT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT
| VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT;
return new D3D11CounterBuffer(m_dxvkDevice,
xfbCounterInfo, sizeof(D3D11SOCounter));
}
Rc<D3D11CounterBuffer> D3D11Device::CreatePredicateBuffer() { Rc<D3D11CounterBuffer> D3D11Device::CreatePredicateBuffer() {
DxvkBufferCreateInfo predCounterInfo; DxvkBufferCreateInfo predCounterInfo;
predCounterInfo.size = 4096 * sizeof(uint32_t); predCounterInfo.size = 4096 * sizeof(uint32_t);

4
src/d3d11/d3d11_device.h
View File

@ -425,10 +425,8 @@ namespace dxvk {
return m_d3d10Device; return m_d3d10Device;
} }
DxvkBufferSlice AllocXfbCounterSlice() { return m_xfbCounters->AllocSlice(); }
DxvkBufferSlice AllocPredicateSlice () { return m_predicates ->AllocSlice(); } DxvkBufferSlice AllocPredicateSlice () { return m_predicates ->AllocSlice(); }
void FreeXfbCounterSlice(const DxvkBufferSlice& Slice) { m_xfbCounters->FreeSlice(Slice); }
void FreePredicateSlice (const DxvkBufferSlice& Slice) { m_predicates ->FreeSlice(Slice); } void FreePredicateSlice (const DxvkBufferSlice& Slice) { m_predicates ->FreeSlice(Slice); }
static bool CheckFeatureLevelSupport( static bool CheckFeatureLevelSupport(
@ -459,7 +457,6 @@ namespace dxvk {
D3D11ImmediateContext* m_context = nullptr; D3D11ImmediateContext* m_context = nullptr;
D3D10Device* m_d3d10Device = nullptr; D3D10Device* m_d3d10Device = nullptr;
Rc<D3D11CounterBuffer> m_xfbCounters;
Rc<D3D11CounterBuffer> m_predicates; Rc<D3D11CounterBuffer> m_predicates;
D3D11StateObjectSet<D3D11BlendState> m_bsStateObjects; D3D11StateObjectSet<D3D11BlendState> m_bsStateObjects;
@ -469,7 +466,6 @@ namespace dxvk {
D3D11ShaderModuleSet m_shaderModules; D3D11ShaderModuleSet m_shaderModules;
D3D11CommandListAllocator m_commandListAllocator; D3D11CommandListAllocator m_commandListAllocator;
Rc<D3D11CounterBuffer> CreateXFBCounterBuffer();
Rc<D3D11CounterBuffer> CreatePredicateBuffer(); Rc<D3D11CounterBuffer> CreatePredicateBuffer();
HRESULT CreateShaderModule( HRESULT CreateShaderModule(