diff options
| author | Mat M <mathew1800@gmail.com> | 2018-03-16 11:59:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 11:59:14 -0400 |
| commit | 9f4d5122a2a1b2d0dbfd6164a616d1c859ef0d0b (patch) | |
| tree | b1abde9e2426fee186ef9ae114d76e03ebaeae3e /Source/Core/VideoBackends/Vulkan/Util.cpp | |
| parent | 1259370cdfcc23c0939bb72fb5dcf2e62096192f (diff) | |
| parent | 50a476c3714b3c423609ec04ce424c244bd2a1c1 (diff) | |
Merge pull request #6438 from lioncash/assert
Assert: Uppercase assertion macros
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/Util.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/Util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/Util.cpp b/Source/Core/VideoBackends/Vulkan/Util.cpp index facae2ac14..07c0311da1 100644 --- a/Source/Core/VideoBackends/Vulkan/Util.cpp +++ b/Source/Core/VideoBackends/Vulkan/Util.cpp @@ -397,7 +397,7 @@ void UtilityShaderDraw::CommitPSUniforms(size_t size) void UtilityShaderDraw::SetPushConstants(const void* data, size_t data_size) { - _assert_(static_cast<u32>(data_size) < PUSH_CONSTANT_BUFFER_SIZE); + ASSERT(static_cast<u32>(data_size) < PUSH_CONSTANT_BUFFER_SIZE); vkCmdPushConstants(m_command_buffer, m_pipeline_info.pipeline_layout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, 0, @@ -414,8 +414,8 @@ void UtilityShaderDraw::SetPSSampler(size_t index, VkImageView view, VkSampler s void UtilityShaderDraw::SetPSTexelBuffer(VkBufferView view) { // Should only be used with the texture conversion pipeline layout. - _assert_(m_pipeline_info.pipeline_layout == - g_object_cache->GetPipelineLayout(PIPELINE_LAYOUT_TEXTURE_CONVERSION)); + ASSERT(m_pipeline_info.pipeline_layout == + g_object_cache->GetPipelineLayout(PIPELINE_LAYOUT_TEXTURE_CONVERSION)); m_ps_texel_buffer = view; } @@ -765,7 +765,7 @@ void ComputeShaderDispatcher::CommitUniformBuffer(size_t size) void ComputeShaderDispatcher::SetPushConstants(const void* data, size_t data_size) { - _assert_(static_cast<u32>(data_size) < PUSH_CONSTANT_BUFFER_SIZE); + ASSERT(static_cast<u32>(data_size) < PUSH_CONSTANT_BUFFER_SIZE); vkCmdPushConstants(m_command_buffer, m_pipeline_info.pipeline_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, static_cast<u32>(data_size), data); |
