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/StateTracker.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/StateTracker.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/StateTracker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp index a3961daf48..38a91c61ad 100644 --- a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp +++ b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp @@ -37,7 +37,7 @@ StateTracker* StateTracker::GetInstance() bool StateTracker::CreateInstance() { - _assert_(!s_state_tracker); + ASSERT(!s_state_tracker); s_state_tracker = std::make_unique<StateTracker>(); if (!s_state_tracker->Initialize()) { @@ -116,7 +116,7 @@ void StateTracker::SetIndexBuffer(VkBuffer buffer, VkDeviceSize offset, VkIndexT void StateTracker::SetRenderPass(VkRenderPass load_render_pass, VkRenderPass clear_render_pass) { // Should not be changed within a render pass. - _assert_(!InRenderPass()); + ASSERT(!InRenderPass()); m_load_render_pass = load_render_pass; m_clear_render_pass = clear_render_pass; } @@ -124,7 +124,7 @@ void StateTracker::SetRenderPass(VkRenderPass load_render_pass, VkRenderPass cle void StateTracker::SetFramebuffer(VkFramebuffer framebuffer, const VkRect2D& render_area) { // Should not be changed within a render pass. - _assert_(!InRenderPass()); + ASSERT(!InRenderPass()); m_framebuffer = framebuffer; m_framebuffer_size = render_area; } @@ -395,7 +395,7 @@ void StateTracker::EndRenderPass() void StateTracker::BeginClearRenderPass(const VkRect2D& area, const VkClearValue* clear_values, u32 num_clear_values) { - _assert_(!InRenderPass()); + ASSERT(!InRenderPass()); m_current_render_pass = m_clear_render_pass; m_framebuffer_render_area = area; |
