From 50a476c3714b3c423609ec04ce424c244bd2a1c1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 14 Mar 2018 20:34:35 -0400 Subject: Assert: Uppercase assertion macros Macros should be all upper-cased. This is also kind of a wart that's been sticking out for quite a while now (we avoid prefixing underscores). --- Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp') diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 95d5b0a9cd..0990f01fb6 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. - _dbg_assert_(VIDEO, s_pipeline_programs.empty()); + DEBUG_ASSERT(VIDEO, s_pipeline_programs.empty()); s_pipeline_programs.clear(); } @@ -575,14 +575,14 @@ const PipelineProgram* ProgramShaderCache::GetPipelineProgram(const GLVertexForm prog->key = key; // Attach shaders. - _assert_(vertex_shader && vertex_shader->GetStage() == ShaderStage::Vertex); - _assert_(pixel_shader && pixel_shader->GetStage() == ShaderStage::Pixel); + ASSERT(vertex_shader && vertex_shader->GetStage() == ShaderStage::Vertex); + ASSERT(pixel_shader && pixel_shader->GetStage() == ShaderStage::Pixel); prog->shader.glprogid = glCreateProgram(); glAttachShader(prog->shader.glprogid, vertex_shader->GetGLShaderID()); glAttachShader(prog->shader.glprogid, pixel_shader->GetGLShaderID()); if (geometry_shader) { - _assert_(geometry_shader->GetStage() == ShaderStage::Geometry); + ASSERT(geometry_shader->GetStage() == ShaderStage::Geometry); glAttachShader(prog->shader.glprogid, geometry_shader->GetGLShaderID()); } @@ -627,7 +627,7 @@ const PipelineProgram* ProgramShaderCache::GetPipelineProgram(const GLVertexForm void ProgramShaderCache::ReleasePipelineProgram(const PipelineProgram* prog) { auto iter = s_pipeline_programs.find(prog->key); - _assert_(iter != s_pipeline_programs.end() && prog == iter->second.get()); + ASSERT(iter != s_pipeline_programs.end() && prog == iter->second.get()); if (--iter->second->reference_count == 0) { -- cgit v1.2.3