kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas: Fix clang warning in generated shaders file 

Use const char a[] instead of const char const a[].
This commit is contained in:
Jean-Philippe Andre 2015-04-21 18:30:58 +09:00
parent 63204da26a
commit 20dac6d27a
5 changed files with 167 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/evas/engines/gl_common/evas_gl_shader.c
View File

@ -393,7 +393,7 @@ evas_gl_common_img_shader_select(Shader_Sampling sam, int nomul, int afill, int
const char *
evas_gl_common_shader_name_get(Evas_GL_Shader shd)
{
if ((shd >= 0) && (shd < (sizeof(_shaders_source) / sizeof(_shaders_source[0]))))
if (shd < (sizeof(_shaders_source) / sizeof(_shaders_source[0])))
return _shaders_source[shd].name;
return "UNKNOWN";
}

296
src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
View File

File diff suppressed because it is too large Load Diff

2
src/modules/evas/engines/gl_common/shader/gen_shaders.sh
View File

@ -126,7 +126,7 @@ for (( i = 0; i < ${#SHADERS[@]} ; i++ )) ; do
OIFS=$IFS
IFS=$'\n'
printf "static const char const ${shdname}_glsl[] =" >> ${OUTPUT}
printf "static const char ${shdname}_glsl[] =" >> ${OUTPUT}
for line in `cat ${shd}` ; do
printf "\n \"${line}\\\n\"" >> ${OUTPUT}
done

32
src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
View File

@ -1,7 +1,7 @@
/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED
* See: modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh */
static const char const vertex_color_vert_glsl[] =
static const char vertex_color_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -44,7 +44,7 @@ static const char const vertex_color_vert_glsl[] =
" gl_Position = uMatrixMvp * position;\n"
"}\n";
static const char const vertex_color_frag_glsl[] =
static const char vertex_color_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -67,7 +67,7 @@ static const char const vertex_color_frag_glsl[] =
"#endif //FOG_ENABLED\n"
"}\n";
static const char const diffuse_vert_glsl[] =
static const char diffuse_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -111,7 +111,7 @@ static const char const diffuse_vert_glsl[] =
" gl_Position = uMatrixMvp * position;\n"
"}\n";
static const char const diffuse_frag_glsl[] =
static const char diffuse_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -159,7 +159,7 @@ static const char const diffuse_frag_glsl[] =
"#endif //FOG_ENABLED\n"
"}\n";
static const char const flat_vert_glsl[] =
static const char flat_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -284,7 +284,7 @@ static const char const flat_vert_glsl[] =
"#endif //SHADOWED\n"
"}\n";
static const char const flat_frag_glsl[] =
static const char flat_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -440,7 +440,7 @@ static const char const flat_frag_glsl[] =
"#endif //FOG_ENABLED\n"
"}\n";
static const char const phong_vert_glsl[] =
static const char phong_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -533,7 +533,7 @@ static const char const phong_vert_glsl[] =
"#endif //SHADOWED\n"
"}\n";
static const char const phong_frag_glsl[] =
static const char phong_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -727,7 +727,7 @@ static const char const phong_frag_glsl[] =
"#endif //FOG_ENABLED\n"
"}\n";
static const char const normal_map_vert_glsl[] =
static const char normal_map_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -877,7 +877,7 @@ static const char const normal_map_vert_glsl[] =
"#endif\n"
"}\n";
static const char const normal_map_frag_glsl[] =
static const char normal_map_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -1106,7 +1106,7 @@ static const char const normal_map_frag_glsl[] =
"#endif //FOG_ENABLED\n"
"}\n";
static const char const shadow_map_vert_glsl[] =
static const char shadow_map_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -1154,7 +1154,7 @@ static const char const shadow_map_vert_glsl[] =
" gl_Position = uMatrixMvp * position;\n"
"}\n";
static const char const shadow_map_frag_glsl[] =
static const char shadow_map_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -1194,7 +1194,7 @@ static const char const shadow_map_frag_glsl[] =
" gl_FragColor.r = gl_FragCoord.z;\n"
"}\n";
static const char const color_pick_vert_glsl[] =
static const char color_pick_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -1221,7 +1221,7 @@ static const char const color_pick_vert_glsl[] =
" gl_Position = uMatrixMvp * position;\n"
"}\n";
static const char const color_pick_frag_glsl[] =
static const char color_pick_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -1233,7 +1233,7 @@ static const char const color_pick_frag_glsl[] =
" gl_FragColor = vec4(uColorPick);\n"
"}\n";
static const char const parallax_occlusion_vert_glsl[] =
static const char parallax_occlusion_vert_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"
@ -1353,7 +1353,7 @@ static const char const parallax_occlusion_vert_glsl[] =
"#endif //SHADOWED\n"
"}\n";
static const char const parallax_occlusion_frag_glsl[] =
static const char parallax_occlusion_frag_glsl[] =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"precision mediump int;\n"

2
src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
View File

@ -29,7 +29,7 @@ for shd in ${SHADERS} ; do
OIFS=$IFS
IFS=$'\n'
printf "static const char const ${lname}_glsl[] ="
printf "static const char ${lname}_glsl[] ="
for line in `cat ${shd}.tmp` ; do
printf "\n \"${line}\\\n\""
done