rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-12 22:08:59 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Track highest bound unordered access view

Browse Source
This commit is contained in:
Philip Rebohle 2022-08-04 18:17:23 +02:00
parent 934caa3fd7
commit 7e237b33b7
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/d3d11/d3d11_context.cpp
View File

@ -2126,6 +2126,9 @@ namespace dxvk {
ResolveCsSrvHazards(uav); ResolveCsSrvHazards(uav);
} }
} }
m_state.uav.maxCount = std::clamp(StartSlot + NumUAVs,
m_state.uav.maxCount, uint32_t(m_state.uav.views.size()));
} }
@ -3795,8 +3798,8 @@ namespace dxvk {
result.stages[i].reserved = 0; result.stages[i].reserved = 0;
} }
result.stages[uint32_t(DxbcProgramType::PixelShader)].uavCount = D3D11_1_UAV_SLOT_COUNT; result.stages[uint32_t(DxbcProgramType::PixelShader)].uavCount = m_state.om.maxUav;
result.stages[uint32_t(DxbcProgramType::ComputeShader)].uavCount = D3D11_1_UAV_SLOT_COUNT; result.stages[uint32_t(DxbcProgramType::ComputeShader)].uavCount = m_state.uav.maxCount;
result.vbCount = m_state.ia.maxVbCount; result.vbCount = m_state.ia.maxVbCount;
result.soCount = D3D11_SO_BUFFER_SLOT_COUNT; result.soCount = D3D11_SO_BUFFER_SLOT_COUNT;
@ -4151,10 +4154,14 @@ namespace dxvk {
? m_state.uav.views ? m_state.uav.views
: m_state.om.uavs; : m_state.om.uavs;
uint32_t maxCount = Stage == DxbcProgramType::ComputeShader
? m_state.uav.maxCount
: m_state.om.maxUav;
uint32_t uavSlotId = computeUavBinding(Stage, 0); uint32_t uavSlotId = computeUavBinding(Stage, 0);
uint32_t ctrSlotId = computeUavCounterBinding(Stage, 0); uint32_t ctrSlotId = computeUavCounterBinding(Stage, 0);
for (uint32_t i = 0; i < views.size(); i++) { for (uint32_t i = 0; i < maxCount; i++) {
BindUnorderedAccessView<Stage>( BindUnorderedAccessView<Stage>(
uavSlotId + i, views[i].ptr(), uavSlotId + i, views[i].ptr(),
ctrSlotId + i, ~0u); ctrSlotId + i, ~0u);

5
src/d3d11/d3d11_context_state.h
View File

@ -127,11 +127,14 @@ namespace dxvk {
D3D11ShaderStageUavBinding views = { }; D3D11ShaderStageUavBinding views = { };
DxvkBindingSet<D3D11_1_UAV_SLOT_COUNT> mask = { }; DxvkBindingSet<D3D11_1_UAV_SLOT_COUNT> mask = { };
uint32_t maxCount = 0;
void reset() { void reset() {
for (uint32_t i = 0; i < views.size(); i++) for (uint32_t i = 0; i < maxCount; i++)
views[i] = nullptr; views[i] = nullptr;
mask.clear(); mask.clear();
maxCount = 0;
} }
}; };