diff options
author | 2018-10-19 00:35:32 +0200 | |
---|---|---|
committer | 2018-10-19 00:35:32 +0200 | |
commit | efe1757a858f03fff73e110626e85af8d2ed7d03 (patch) | |
tree | 5433f1344a7120f3d90f9480e79c65ca850b7564 /src/osd/modules/opengl/gl_shader_mgr.cpp | |
parent | cdb4ae2fab56a624bf8e2ea59f19a57f11ff1109 (diff) | |
parent | f1b3e649fb0a50a6a01da667278b8a62fef99d92 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src/osd/modules/opengl/gl_shader_mgr.cpp')
-rw-r--r-- | src/osd/modules/opengl/gl_shader_mgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/osd/modules/opengl/gl_shader_mgr.cpp b/src/osd/modules/opengl/gl_shader_mgr.cpp index de36240ab3e..0cf3f9b6617 100644 --- a/src/osd/modules/opengl/gl_shader_mgr.cpp +++ b/src/osd/modules/opengl/gl_shader_mgr.cpp @@ -15,12 +15,12 @@ #ifdef GLSL_SOURCE_ON_DISK -static const char * glsl_mamebm_vsh_files [GLSL_VERTEX_SHADER_INT_NUMBER] = +static char const *const glsl_mamebm_vsh_files [GLSL_VERTEX_SHADER_INT_NUMBER] = { "/tmp/glsl_general.vsh" // general }; -static const char * glsl_mamebm_fsh_files [GLSL_SHADER_FEAT_INT_NUMBER] = +static char const *const glsl_mamebm_fsh_files [GLSL_SHADER_FEAT_INT_NUMBER] = { "/tmp/glsl_plain_rgb32_dir.fsh", // rgb32 dir plain "/tmp/glsl_bilinear_rgb32_dir.fsh", // rgb32 dir bilinear @@ -35,12 +35,12 @@ static const char * glsl_mamebm_fsh_files [GLSL_SHADER_FEAT_INT_NUMBER] = #include "shader/glsl_bilinear_rgb32_dir.fsh.c" #include "shader/glsl_bicubic_rgb32_dir.fsh.c" -static const char * glsl_mamebm_vsh_sources [GLSL_VERTEX_SHADER_INT_NUMBER] = +static char const *const glsl_mamebm_vsh_sources [GLSL_VERTEX_SHADER_INT_NUMBER] = { glsl_general_vsh_src // general }; -static const char * glsl_mamebm_fsh_sources [GLSL_SHADER_FEAT_INT_NUMBER] = +static char const *const glsl_mamebm_fsh_sources [GLSL_SHADER_FEAT_INT_NUMBER] = { glsl_plain_rgb32_dir_fsh_src, // rgb32 dir plain glsl_bilinear_rgb32_dir_fsh_src, // rgb32 dir bilinear @@ -49,7 +49,7 @@ static const char * glsl_mamebm_fsh_sources [GLSL_SHADER_FEAT_INT_NUMBER] = #endif // GLSL_SOURCE_ON_DISK -static const char * glsl_mamebm_filter_names [GLSL_SHADER_FEAT_MAX_NUMBER] = +static char const *const glsl_mamebm_filter_names [GLSL_SHADER_FEAT_MAX_NUMBER] = { "plain", "bilinear", |