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

[d3d11] Fix RestoreUnorderedAccessViews for pixel shaders

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-10 12:47:45 +01:00
parent ca53fe7925
commit 5cb6c968b5
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/d3d11/d3d11_context.cpp
View File

@ -139,7 +139,7 @@ namespace dxvk {
this->CSSetUnorderedAccessViews(i, 1, &uav, nullptr); this->CSSetUnorderedAccessViews(i, 1, &uav, nullptr);
} }
this->OMSetRenderTargets(0, nullptr, nullptr); this->OMSetRenderTargetsAndUnorderedAccessViews(0, nullptr, nullptr, 0, 0, nullptr, nullptr);
this->OMSetBlendState(nullptr, nullptr, D3D11_DEFAULT_SAMPLE_MASK); this->OMSetBlendState(nullptr, nullptr, D3D11_DEFAULT_SAMPLE_MASK);
this->OMSetDepthStencilState(nullptr, 0); this->OMSetDepthStencilState(nullptr, 0);
@ -147,7 +147,7 @@ namespace dxvk {
this->RSSetViewports(0, nullptr); this->RSSetViewports(0, nullptr);
this->RSSetScissorRects(0, nullptr); this->RSSetScissorRects(0, nullptr);
// this->SOSetTargets(0, nullptr, nullptr); this->SOSetTargets(0, nullptr, nullptr);
this->SetPredication(nullptr, FALSE); this->SetPredication(nullptr, FALSE);
} }
@ -2409,8 +2409,8 @@ namespace dxvk {
RestoreShaderResources(DxbcProgramType::PixelShader, m_state.ps.shaderResources); RestoreShaderResources(DxbcProgramType::PixelShader, m_state.ps.shaderResources);
RestoreShaderResources(DxbcProgramType::ComputeShader, m_state.cs.shaderResources); RestoreShaderResources(DxbcProgramType::ComputeShader, m_state.cs.shaderResources);
RestoreUnorderedAccessViews(DxbcProgramType::PixelShader, m_state.ps.unorderedAccessViews); RestoreUnorderedAccessViews(DxbcProgramType::PixelShader, m_state.ps.unorderedAccessViews, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT);
RestoreUnorderedAccessViews(DxbcProgramType::ComputeShader, m_state.cs.unorderedAccessViews); RestoreUnorderedAccessViews(DxbcProgramType::ComputeShader, m_state.cs.unorderedAccessViews, D3D11_1_UAV_SLOT_COUNT);
} }
@ -2449,14 +2449,15 @@ namespace dxvk {
void D3D11DeviceContext::RestoreUnorderedAccessViews( void D3D11DeviceContext::RestoreUnorderedAccessViews(
DxbcProgramType Stage, DxbcProgramType Stage,
D3D11UnorderedAccessBindings& Bindings) { D3D11UnorderedAccessBindings& Bindings,
UINT SlotCount) {
const uint32_t uavSlotId = computeResourceSlotId( const uint32_t uavSlotId = computeResourceSlotId(
Stage, DxbcBindingType::UnorderedAccessView, 0); Stage, DxbcBindingType::UnorderedAccessView, 0);
const uint32_t ctrSlotId = computeResourceSlotId( const uint32_t ctrSlotId = computeResourceSlotId(
Stage, DxbcBindingType::UavCounter, 0); Stage, DxbcBindingType::UavCounter, 0);
for (uint32_t i = 0; i < Bindings.size(); i++) { for (uint32_t i = 0; i < SlotCount; i++) {
BindUnorderedAccessView( BindUnorderedAccessView(
uavSlotId + i, ctrSlotId + i, uavSlotId + i, ctrSlotId + i,
Bindings[i].ptr()); Bindings[i].ptr());

3
src/d3d11/d3d11_context.h
View File

@ -634,7 +634,8 @@ namespace dxvk {
void RestoreUnorderedAccessViews( void RestoreUnorderedAccessViews(
DxbcProgramType Stage, DxbcProgramType Stage,
D3D11UnorderedAccessBindings& Bindings); D3D11UnorderedAccessBindings& Bindings,
UINT SlotCount);
DxvkDataSlice AllocUpdateBufferSlice(size_t Size); DxvkDataSlice AllocUpdateBufferSlice(size_t Size);