From c89f04a7c5256d92b75e9868df9af6cfb7050559 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Mon, 3 Mar 2014 06:25:15 +0100 Subject: clang-modernize -loop-convert and some manual adjustments --- .../Core/VideoBackends/OGL/ProgramShaderCache.cpp | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 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 0de9034f51..68c1e44399 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -404,21 +404,26 @@ void ProgramShaderCache::Shutdown(void) // store all shaders in cache on disk if (g_ogl_config.bSupportsGLSLCache && !g_Config.bEnableShaderDebugging) { - PCache::iterator iter = pshaders.begin(); - for (; iter != pshaders.end(); ++iter) + for (auto& entry : pshaders) { - if(iter->second.in_cache) continue; + if(entry.second.in_cache) + { + continue; + } GLint binary_size; - glGetProgramiv(iter->second.shader.glprogid, GL_PROGRAM_BINARY_LENGTH, &binary_size); - if(!binary_size) continue; + glGetProgramiv(entry.second.shader.glprogid, GL_PROGRAM_BINARY_LENGTH, &binary_size); + if(!binary_size) + { + continue; + } u8 *data = new u8[binary_size+sizeof(GLenum)]; u8 *binary = data + sizeof(GLenum); GLenum *prog_format = (GLenum*)data; - glGetProgramBinary(iter->second.shader.glprogid, binary_size, NULL, prog_format, binary); + glGetProgramBinary(entry.second.shader.glprogid, binary_size, NULL, prog_format, binary); - g_program_disk_cache.Append(iter->first, data, binary_size+sizeof(GLenum)); + g_program_disk_cache.Append(entry.first, data, binary_size+sizeof(GLenum)); delete [] data; } @@ -428,9 +433,10 @@ void ProgramShaderCache::Shutdown(void) glUseProgram(0); - PCache::iterator iter = pshaders.begin(); - for (; iter != pshaders.end(); ++iter) - iter->second.Destroy(); + for (auto& entry : pshaders) + { + entry.second.Destroy(); + } pshaders.clear(); pixel_uid_checker.Invalidate(); -- cgit v1.2.3 From d802d392811be44d34ae9cd23f616db93e54c50f Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 9 Mar 2014 21:14:26 +0100 Subject: clang-modernize -use-nullptr and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine --- 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 68c1e44399..c4e150d7d0 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -194,7 +194,7 @@ SHADER* ProgramShaderCache::SetShader ( DSTALPHA_MODE dstAlphaMode, u32 componen if (!CompileShader(newentry.shader, vcode.GetBuffer(), pcode.GetBuffer())) { GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true); - return NULL; + return nullptr; } INCSTAT(stats.numPixelShadersCreated); @@ -281,7 +281,7 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code ) const char *src[] = {s_glsl_header, code}; - glShaderSource(result, 2, src, NULL); + glShaderSource(result, 2, src, nullptr); glCompileShader(result); GLint compileStatus; glGetShaderiv(result, GL_COMPILE_STATUS, &compileStatus); @@ -396,7 +396,7 @@ void ProgramShaderCache::Init(void) CreateHeader(); CurrentProgram = 0; - last_entry = NULL; + last_entry = nullptr; } void ProgramShaderCache::Shutdown(void) @@ -421,7 +421,7 @@ void ProgramShaderCache::Shutdown(void) u8 *data = new u8[binary_size+sizeof(GLenum)]; u8 *binary = data + sizeof(GLenum); GLenum *prog_format = (GLenum*)data; - glGetProgramBinary(entry.second.shader.glprogid, binary_size, NULL, prog_format, binary); + glGetProgramBinary(entry.second.shader.glprogid, binary_size, nullptr, prog_format, binary); g_program_disk_cache.Append(entry.first, data, binary_size+sizeof(GLenum)); delete [] data; @@ -443,7 +443,7 @@ void ProgramShaderCache::Shutdown(void) vertex_uid_checker.Invalidate(); delete s_buffer; - s_buffer = 0; + s_buffer = nullptr; } void ProgramShaderCache::CreateHeader ( void ) -- cgit v1.2.3