backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Do not dispatch compute shaders if no pipeline is bound

Browse Source 
Fixes crashes in Tomb Raider 2013.
This commit is contained in:
Philip Rebohle 2018-01-25 12:57:43 +01:00
parent e4d49aeb66
commit d3fe3622cc
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/dxvk/dxvk_context.cpp
View File

@ -513,9 +513,11 @@ namespace dxvk {
uint32_t z) { uint32_t z) {
this->commitComputeState(); this->commitComputeState();
m_cmd->cmdDispatch(x, y, z); if (m_cpActivePipeline != VK_NULL_HANDLE) {
m_cmd->cmdDispatch(x, y, z);
this->commitComputeBarriers();
this->commitComputeBarriers();
}
} }
@ -525,11 +527,13 @@ namespace dxvk {
auto physicalSlice = buffer.physicalSlice(); auto physicalSlice = buffer.physicalSlice();
m_cmd->cmdDispatchIndirect( if (m_cpActivePipeline != VK_NULL_HANDLE) {
physicalSlice.handle(), m_cmd->cmdDispatchIndirect(
physicalSlice.offset()); physicalSlice.handle(),
physicalSlice.offset());
this->commitComputeBarriers();
this->commitComputeBarriers();
}
} }
@ -1150,9 +1154,18 @@ namespace dxvk {
m_state.cp.pipeline = m_device->createComputePipeline( m_state.cp.pipeline = m_device->createComputePipeline(
m_state.cp.cs.shader); m_state.cp.cs.shader);
m_cmd->cmdBindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, m_cpActivePipeline = m_state.cp.pipeline != nullptr
m_state.cp.pipeline->getPipelineHandle()); ? m_state.cp.pipeline->getPipelineHandle()
m_cmd->trackResource(m_state.cp.pipeline); : VK_NULL_HANDLE;
if (m_state.cp.pipeline != nullptr)
m_cmd->trackResource(m_state.cp.pipeline);
if (m_cpActivePipeline != VK_NULL_HANDLE) {
m_cmd->cmdBindPipeline(
VK_PIPELINE_BIND_POINT_COMPUTE,
m_cpActivePipeline);
}
} }
} }
@ -1166,7 +1179,8 @@ namespace dxvk {
m_state.gp.vs.shader, m_state.gp.tcs.shader, m_state.gp.tes.shader, m_state.gp.vs.shader, m_state.gp.tcs.shader, m_state.gp.tes.shader,
m_state.gp.gs.shader, m_state.gp.fs.shader); m_state.gp.gs.shader, m_state.gp.fs.shader);
m_cmd->trackResource(m_state.gp.pipeline); if (m_state.gp.pipeline != nullptr)
m_cmd->trackResource(m_state.gp.pipeline);
} }
} }
@ -1183,8 +1197,9 @@ namespace dxvk {
for (uint32_t i = m_state.gp.state.ilBindingCount; i < MaxNumVertexBindings; i++) for (uint32_t i = m_state.gp.state.ilBindingCount; i < MaxNumVertexBindings; i++)
m_state.gp.state.ilBindings[i].stride = 0; m_state.gp.state.ilBindings[i].stride = 0;
m_gpActivePipeline = m_state.gp.pipeline m_gpActivePipeline = m_state.gp.pipeline != nullptr
->getPipelineHandle(m_state.gp.state); ? m_state.gp.pipeline->getPipelineHandle(m_state.gp.state)
: VK_NULL_HANDLE;
if (m_gpActivePipeline != VK_NULL_HANDLE) { if (m_gpActivePipeline != VK_NULL_HANDLE) {
m_cmd->cmdBindPipeline( m_cmd->cmdBindPipeline(
@ -1197,9 +1212,11 @@ namespace dxvk {
void DxvkContext::updateComputeShaderResources() { void DxvkContext::updateComputeShaderResources() {
if (m_flags.test(DxvkContextFlag::CpDirtyResources)) { if (m_flags.test(DxvkContextFlag::CpDirtyResources)) {
this->updateShaderResources( if (m_state.cp.pipeline != nullptr) {
VK_PIPELINE_BIND_POINT_COMPUTE, this->updateShaderResources(
m_state.cp.pipeline->layout()); VK_PIPELINE_BIND_POINT_COMPUTE,
m_state.cp.pipeline->layout());
}
} }
} }
@ -1208,19 +1225,23 @@ namespace dxvk {
if (m_flags.test(DxvkContextFlag::CpDirtyResources)) { if (m_flags.test(DxvkContextFlag::CpDirtyResources)) {
m_flags.clr(DxvkContextFlag::CpDirtyResources); m_flags.clr(DxvkContextFlag::CpDirtyResources);
this->updateShaderDescriptors( if (m_state.cp.pipeline != nullptr) {
VK_PIPELINE_BIND_POINT_COMPUTE, this->updateShaderDescriptors(
m_state.cp.bs, VK_PIPELINE_BIND_POINT_COMPUTE,
m_state.cp.pipeline->layout()); m_state.cp.bs,
m_state.cp.pipeline->layout());
}
} }
} }
void DxvkContext::updateGraphicsShaderResources() { void DxvkContext::updateGraphicsShaderResources() {
if (m_flags.test(DxvkContextFlag::GpDirtyResources)) { if (m_flags.test(DxvkContextFlag::GpDirtyResources)) {
this->updateShaderResources( if (m_state.gp.pipeline != nullptr) {
VK_PIPELINE_BIND_POINT_GRAPHICS, this->updateShaderResources(
m_state.gp.pipeline->layout()); VK_PIPELINE_BIND_POINT_GRAPHICS,
m_state.gp.pipeline->layout());
}
} }
} }
@ -1229,10 +1250,12 @@ namespace dxvk {
if (m_flags.test(DxvkContextFlag::GpDirtyResources)) { if (m_flags.test(DxvkContextFlag::GpDirtyResources)) {
m_flags.clr(DxvkContextFlag::GpDirtyResources); m_flags.clr(DxvkContextFlag::GpDirtyResources);
this->updateShaderDescriptors( if (m_state.gp.pipeline != nullptr) {
VK_PIPELINE_BIND_POINT_GRAPHICS, this->updateShaderDescriptors(
m_state.gp.state.bsBindingState, VK_PIPELINE_BIND_POINT_GRAPHICS,
m_state.gp.pipeline->layout()); m_state.gp.state.bsBindingState,
m_state.gp.pipeline->layout());
}
} }
} }

2
src/dxvk/dxvk_context.h
View File

@ -520,7 +520,7 @@ namespace dxvk {
DxvkBarrierSet m_barriers; DxvkBarrierSet m_barriers;
VkPipeline m_gpActivePipeline = VK_NULL_HANDLE; VkPipeline m_gpActivePipeline = VK_NULL_HANDLE;
// VkPipeline m_cpActivePipeline = VK_NULL_HANDLE; /* will be used later */ VkPipeline m_cpActivePipeline = VK_NULL_HANDLE;
std::array<DxvkShaderResourceSlot, MaxNumResourceSlots> m_rc; std::array<DxvkShaderResourceSlot, MaxNumResourceSlots> m_rc;
std::array<DxvkDescriptorInfo, MaxNumResourceSlots> m_descriptors; std::array<DxvkDescriptorInfo, MaxNumResourceSlots> m_descriptors;