Merge pull request #5968 from JonnyH/WIP/fix-vulkan-on-drivers-without-atomic-load-support

Fix vulkan crash on drivers without atomic load/store support
This commit is contained in:
Stenzek 2017-08-24 12:02:49 +10:00 committed by GitHub
commit 7155698066

View file

@ -1118,7 +1118,8 @@ bool StateTracker::UpdateDescriptorSet()
m_dirty_flags |= DIRTY_FLAG_DESCRIPTOR_SET_BINDING; m_dirty_flags |= DIRTY_FLAG_DESCRIPTOR_SET_BINDING;
} }
if ((m_dirty_flags & DIRTY_FLAG_PS_SSBO || if (IsSSBODescriptorRequired() &&
(m_dirty_flags & DIRTY_FLAG_PS_SSBO ||
m_descriptor_sets[DESCRIPTOR_SET_BIND_POINT_STORAGE_OR_TEXEL_BUFFER] == VK_NULL_HANDLE)) m_descriptor_sets[DESCRIPTOR_SET_BIND_POINT_STORAGE_OR_TEXEL_BUFFER] == VK_NULL_HANDLE))
{ {
VkDescriptorSetLayout layout = VkDescriptorSetLayout layout =