diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-04-12 21:40:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 21:40:29 +0200 |
| commit | b2de380d162c4805edb94808f38a214725d2724e (patch) | |
| tree | 1d8a9e7eea10820e5d645ad5028e506836b856de /Source/Core/VideoBackends/Vulkan/Util.cpp | |
| parent | 0bfeb37a1f50193d39559d29802cb48f45db2b02 (diff) | |
| parent | 40bb9974f21878e64fb03d70e717cb996bf13a29 (diff) | |
Merge pull request #6635 from spycrab/fix_linter
Tools: Bump lint.sh version
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/Util.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/Util.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/Util.cpp b/Source/Core/VideoBackends/Vulkan/Util.cpp index 07c0311da1..9e9060c5a3 100644 --- a/Source/Core/VideoBackends/Vulkan/Util.cpp +++ b/Source/Core/VideoBackends/Vulkan/Util.cpp @@ -585,12 +585,18 @@ void UtilityShaderDraw::BindDescriptors() if (set == VK_NULL_HANDLE) PanicAlert("Failed to allocate descriptor set for utility draw"); - set_writes[num_set_writes++] = { - VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr, set, UBO_DESCRIPTOR_SET_BINDING_VS, 0, 1, - VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, nullptr, - (m_vs_uniform_buffer.buffer != VK_NULL_HANDLE) ? &m_vs_uniform_buffer : - &dummy_uniform_buffer, - nullptr}; + set_writes[num_set_writes++] = {VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, + nullptr, + set, + UBO_DESCRIPTOR_SET_BINDING_VS, + 0, + 1, + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, + nullptr, + (m_vs_uniform_buffer.buffer != VK_NULL_HANDLE) ? + &m_vs_uniform_buffer : + &dummy_uniform_buffer, + nullptr}; if (g_vulkan_context->SupportsGeometryShaders()) { @@ -606,12 +612,18 @@ void UtilityShaderDraw::BindDescriptors() nullptr}; } - set_writes[num_set_writes++] = { - VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, nullptr, set, UBO_DESCRIPTOR_SET_BINDING_PS, 0, 1, - VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, nullptr, - (m_ps_uniform_buffer.buffer != VK_NULL_HANDLE) ? &m_ps_uniform_buffer : - &dummy_uniform_buffer, - nullptr}; + set_writes[num_set_writes++] = {VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, + nullptr, + set, + UBO_DESCRIPTOR_SET_BINDING_PS, + 0, + 1, + VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, + nullptr, + (m_ps_uniform_buffer.buffer != VK_NULL_HANDLE) ? + &m_ps_uniform_buffer : + &dummy_uniform_buffer, + nullptr}; bind_descriptor_sets[DESCRIPTOR_SET_BIND_POINT_UNIFORM_BUFFERS] = set; } |