From 75f5fcdfee4cd643aa347ea69db05c595ed39caf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 16 Mar 2018 12:57:36 -0400 Subject: Assert: Remove unused parameter from DEBUG_ASSERT This brings the macro in line with the regular ASSERT macro, which only has one macro parameter. --- Source/Core/VideoBackends/Vulkan/Renderer.cpp | 2 +- Source/Core/VideoBackends/Vulkan/VKPipeline.cpp | 2 +- Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Source/Core/VideoBackends/Vulkan') diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp index 13bd72ff2a..c69ad396d6 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp @@ -1123,7 +1123,7 @@ void Renderer::SetTexture(u32 index, const AbstractTexture* texture) // Texture should always be in SHADER_READ_ONLY layout prior to use. // This is so we don't need to transition during render passes. auto* tex = texture ? static_cast(texture)->GetRawTexIdentifier() : nullptr; - DEBUG_ASSERT(VIDEO, !tex || tex->GetLayout() == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); + DEBUG_ASSERT(!tex || tex->GetLayout() == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); StateTracker::GetInstance()->SetTexture(index, tex ? tex->GetView() : VK_NULL_HANDLE); } diff --git a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp index 31dcc72a6a..fa513cef7d 100644 --- a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp @@ -27,7 +27,7 @@ VKPipeline::~VKPipeline() std::unique_ptr VKPipeline::Create(const AbstractPipelineConfig& config) { - DEBUG_ASSERT(VIDEO, config.vertex_shader && config.pixel_shader); + DEBUG_ASSERT(config.vertex_shader && config.pixel_shader); // Get render pass for config. VkRenderPass render_pass = g_object_cache->GetRenderPass( diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp index cd09bf6dd5..a62238e8a2 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -216,12 +216,10 @@ void VKTexture::ResolveFromTexture(const AbstractTexture* src, const MathUtil::R u32 layer, u32 level) { const VKTexture* srcentry = static_cast(src); - DEBUG_ASSERT(VIDEO, m_config.samples == 1 && m_config.width == srcentry->m_config.width && - m_config.height == srcentry->m_config.height && - srcentry->m_config.samples > 1); - DEBUG_ASSERT(VIDEO, - rect.left + rect.GetWidth() <= static_cast(srcentry->m_config.width) && - rect.top + rect.GetHeight() <= static_cast(srcentry->m_config.height)); + DEBUG_ASSERT(m_config.samples == 1 && m_config.width == srcentry->m_config.width && + m_config.height == srcentry->m_config.height && srcentry->m_config.samples > 1); + DEBUG_ASSERT(rect.left + rect.GetWidth() <= static_cast(srcentry->m_config.width) && + rect.top + rect.GetHeight() <= static_cast(srcentry->m_config.height)); // Resolving is considered to be a transfer operation. StateTracker::GetInstance()->EndRenderPass(); -- cgit v1.2.3