summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/opengl/gl_shader_mgr.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-24 12:57:58 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-24 12:58:31 +0200
commit89c5e1f681107b6d9f8ba7f761c388d1e2052fe4 (patch)
treec5ce4530d0c03fa1c04021844272b82b7b7ebcbc /src/osd/modules/opengl/gl_shader_mgr.cpp
parentef0968b87042040e1f0e18c84ce804f744f8e23e (diff)
Various cleanups suggested by static analyzer (nw)
Diffstat (limited to 'src/osd/modules/opengl/gl_shader_mgr.cpp')
-rw-r--r--src/osd/modules/opengl/gl_shader_mgr.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/osd/modules/opengl/gl_shader_mgr.cpp b/src/osd/modules/opengl/gl_shader_mgr.cpp
index 21ee7f9fc54..9f8dc8acd05 100644
--- a/src/osd/modules/opengl/gl_shader_mgr.cpp
+++ b/src/osd/modules/opengl/gl_shader_mgr.cpp
@@ -122,7 +122,7 @@ glsl_shader_info *glsl_shader_init(osd_gl_context *gl_ctx)
int i,j, err;
err = gl_shader_loadExtention(gl_ctx);
- if(err) return NULL;
+ if(err) return nullptr;
for (i=0; !err && i<GLSL_VERTEX_SHADER_INT_NUMBER; i++)
{
@@ -137,7 +137,7 @@ glsl_shader_info *glsl_shader_init(osd_gl_context *gl_ctx)
#endif
}
- if(err) return NULL;
+ if(err) return nullptr;
for (j=0; !err && j<GLSL_SHADER_FEAT_INT_NUMBER; j++)
{
@@ -146,16 +146,16 @@ glsl_shader_info *glsl_shader_init(osd_gl_context *gl_ctx)
err = gl_compile_shader_files (&glsl_mamebm_programs[j],
&glsl_mamebm_vsh_shader[glsl_mamebm_fsh2vsh[j]],
&glsl_mamebmfsh_shader[j],
- NULL /*precompiled*/, glsl_mamebm_fsh_files[j], 0);
+ nullptr /*precompiled*/, glsl_mamebm_fsh_files[j], 0);
#else
if(glsl_mamebm_fsh_sources[j])
err = gl_compile_shader_sources(&glsl_mamebm_programs[j],
&glsl_mamebm_vsh_shader[glsl_mamebm_fsh2vsh[j]],
&glsl_mamebm_fsh_shader[j],
- NULL /*precompiled*/, glsl_mamebm_fsh_sources[j]);
+ nullptr /*precompiled*/, glsl_mamebm_fsh_sources[j]);
#endif
}
- if (err) return NULL;
+ if (err) return nullptr;
return (glsl_shader_info *) malloc(sizeof(glsl_shader_info *));
}
@@ -169,29 +169,29 @@ int glsl_shader_free(glsl_shader_info *shinfo)
for (i=0; i<GLSL_VERTEX_SHADER_MAX_NUMBER+9; i++)
{
if ( glsl_mamebm_vsh_shader[i] )
- (void) gl_delete_shader( NULL, &glsl_mamebm_vsh_shader[i], NULL);
+ (void) gl_delete_shader(nullptr, &glsl_mamebm_vsh_shader[i], nullptr);
}
for (j=0; j<GLSL_SHADER_FEAT_MAX_NUMBER+9; j++)
{
if ( glsl_mamebm_fsh_shader[j] )
- (void) gl_delete_shader( NULL, NULL, &glsl_mamebm_fsh_shader[j]);
+ (void) gl_delete_shader(nullptr, nullptr, &glsl_mamebm_fsh_shader[j]);
}
for (j=0; j<GLSL_SHADER_FEAT_MAX_NUMBER+9; j++)
{
if ( glsl_mamebm_programs[j] )
- (void) gl_delete_shader( &glsl_mamebm_programs[j], NULL, NULL);
+ (void) gl_delete_shader( &glsl_mamebm_programs[j], nullptr, nullptr);
}
for (i=0; i<10; i++)
{
if ( glsl_scrn_vsh_shader[i] )
- (void) gl_delete_shader( NULL, &glsl_scrn_vsh_shader[i], NULL);
+ (void) gl_delete_shader(nullptr, &glsl_scrn_vsh_shader[i], nullptr);
if ( glsl_scrn_fsh_shader[i] )
- (void) gl_delete_shader( NULL, NULL, &glsl_scrn_fsh_shader[i]);
+ (void) gl_delete_shader(nullptr, nullptr, &glsl_scrn_fsh_shader[i]);
if ( glsl_scrn_programs[i] )
- (void) gl_delete_shader( &glsl_scrn_programs[i], NULL, NULL);
+ (void) gl_delete_shader( &glsl_scrn_programs[i], nullptr, nullptr);
}
free(shinfo);
@@ -213,7 +213,7 @@ int glsl_shader_add_mamebm(glsl_shader_info *shinfo, const char * custShaderPref
err = gl_compile_shader_files (&glsl_mamebm_programs[GLSL_SHADER_FEAT_CUSTOM+idx],
&glsl_mamebm_vsh_shader[GLSL_VERTEX_SHADER_CUSTOM+idx],
&glsl_mamebm_fsh_shader[GLSL_SHADER_FEAT_CUSTOM+idx],
- NULL /*precompiled*/, fname, 0);
+ nullptr /*precompiled*/, fname, 0);
return err;
}
@@ -233,6 +233,6 @@ int glsl_shader_add_scrn(glsl_shader_info *shinfo, const char * custShaderPrefix
err = gl_compile_shader_files (&glsl_scrn_programs[idx],
&glsl_scrn_vsh_shader[idx],
&glsl_scrn_fsh_shader[idx],
- NULL /*precompiled*/, fname, 0);
+ nullptr /*precompiled*/, fname, 0);
return err;
}