summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
diff options
context:
space:
mode:
authorTillmann Karras <tilkax@gmail.com>2014-03-09 21:14:26 +0100
committerTillmann Karras <tilkax@gmail.com>2014-03-09 21:14:26 +0100
commitd802d392811be44d34ae9cd23f616db93e54c50f (patch)
treef9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
parentf28116b7da6aac6069084596dc4dbf866bdebfd8 (diff)
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp10
1 files changed, 5 insertions, 5 deletions
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 )