diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-03-16 12:57:36 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-03-16 13:01:11 -0400 |
| commit | 75f5fcdfee4cd643aa347ea69db05c595ed39caf (patch) | |
| tree | 840fcdbc69b82dd947b7f4549c01be5146e19c26 /Source/Core/VideoBackends/OGL | |
| parent | 328585ef17386f3a27cae86c2863ede5a28971ef (diff) | |
Assert: Remove unused parameter from DEBUG_ASSERT
This brings the macro in line with the regular ASSERT macro, which only has one
macro parameter.
Diffstat (limited to 'Source/Core/VideoBackends/OGL')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/OGLTexture.cpp | 11 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.cpp b/Source/Core/VideoBackends/OGL/OGLTexture.cpp index bf77db0f6d..4ce9aa398c 100644 --- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp +++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp @@ -279,11 +279,10 @@ void OGLTexture::ResolveFromTexture(const AbstractTexture* src, const MathUtil::Rectangle<int>& rect, u32 layer, u32 level) { const OGLTexture* srcentry = static_cast<const OGLTexture*>(src); - DEBUG_ASSERT(VIDEO, m_config.samples > 1 && m_config.width == srcentry->m_config.width && - m_config.height == srcentry->m_config.height && m_config.samples == 1); - DEBUG_ASSERT(VIDEO, - rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) && - rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height)); + DEBUG_ASSERT(m_config.samples > 1 && m_config.width == srcentry->m_config.width && + m_config.height == srcentry->m_config.height && m_config.samples == 1); + DEBUG_ASSERT(rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) && + rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height)); BlitFramebuffer(const_cast<OGLTexture*>(srcentry), rect, layer, level, rect, layer, level); } @@ -655,7 +654,7 @@ std::unique_ptr<OGLFramebuffer> OGLFramebuffer::Create(const OGLTexture* color_a } } - DEBUG_ASSERT(VIDEO, glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE); + DEBUG_ASSERT(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE); FramebufferManager::SetFramebuffer(0); return std::make_unique<OGLFramebuffer>(color_format, depth_format, width, height, layers, samples, fbo); diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 0990f01fb6..2d284ae4ef 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -507,7 +507,7 @@ void ProgramShaderCache::Shutdown() s_last_VAO = 0; // All pipeline programs should have been released. - DEBUG_ASSERT(VIDEO, s_pipeline_programs.empty()); + DEBUG_ASSERT(s_pipeline_programs.empty()); s_pipeline_programs.clear(); } diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 9d640661a0..ab30fe288a 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1690,7 +1690,7 @@ void Renderer::DrawUtilityPipeline(const void* uniforms, u32 uniforms_size, cons void Renderer::UploadUtilityUniforms(const void* uniforms, u32 uniforms_size) { - DEBUG_ASSERT(VIDEO, uniforms_size > 0); + DEBUG_ASSERT(uniforms_size > 0); auto buf = ProgramShaderCache::GetUniformBuffer()->Map( uniforms_size, ProgramShaderCache::GetUniformBufferAlignment()); |
