summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-05 15:55:58 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-05 15:55:58 +0000
commitde7dc1c2cc5dd4f76901dc11323ec7eee26240a1 (patch)
tree9cd0409f0ecd5af3778199c368213d55e008de6a /src
parent5c7967827b4ea8a202e6ef80974a4ece9d6799c3 (diff)
efl/evas: proper glShaderSource() definition as glext.h
it is "const char * const *", not "const char **", and it was triggering a warning in our code. it's just constness and will not trigger an error in our user's code, just an warning that he should fix. SVN revision: 82278
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/Evas_GL.h2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c4
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
index e3a4e331d6..54bb1c0c9c 100644
--- a/src/lib/evas/Evas_GL.h
+++ b/src/lib/evas/Evas_GL.h
@@ -1393,7 +1393,7 @@ struct _Evas_GL_API
1393 void (*glSampleCoverage) (GLclampf value, GLboolean invert); 1393 void (*glSampleCoverage) (GLclampf value, GLboolean invert);
1394 void (*glScissor) (GLint x, GLint y, GLsizei width, GLsizei height); 1394 void (*glScissor) (GLint x, GLint y, GLsizei width, GLsizei height);
1395 void (*glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length); 1395 void (*glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length);
1396 void (*glShaderSource) (GLuint shader, GLsizei count, const char** string, const GLint* length); 1396 void (*glShaderSource) (GLuint shader, GLsizei count, const char* const * string, const GLint* length);
1397 void (*glStencilFunc) (GLenum func, GLint ref, GLuint mask); 1397 void (*glStencilFunc) (GLenum func, GLint ref, GLuint mask);
1398 void (*glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask); 1398 void (*glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask);
1399 void (*glStencilMask) (GLuint mask); 1399 void (*glStencilMask) (GLuint mask);
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index 02e8297fb1..786be7342e 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -1497,7 +1497,7 @@ _evgld_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, con
1497} 1497}
1498 1498
1499void 1499void
1500_evgld_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length) 1500_evgld_glShaderSource(GLuint shader, GLsizei count, const char* const * string, const GLint* length)
1501{ 1501{
1502 EVGL_FUNC_BEGIN(); 1502 EVGL_FUNC_BEGIN();
1503 glShaderSource(shader, count, string, length); 1503 glShaderSource(shader, count, string, length);
@@ -2093,7 +2093,7 @@ shadersrc_gles_to_gl(GLsizei count, const char** string, char **s, const GLint*
2093 2093
2094 2094
2095void 2095void
2096_evgld_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length) 2096_evgld_glShaderSource(GLuint shader, GLsizei count, const char* const* string, const GLint* length)
2097{ 2097{
2098 EVGL_FUNC_BEGIN(); 2098 EVGL_FUNC_BEGIN();
2099 2099
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 48e9981337..7652259d2d 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -223,7 +223,7 @@ static void (*_sym_glRenderbufferStorage) (GLenum target,
223static void (*_sym_glSampleCoverage) (GLclampf value, GLboolean invert) = NULL; 223static void (*_sym_glSampleCoverage) (GLclampf value, GLboolean invert) = NULL;
224static void (*_sym_glScissor) (GLint x, GLint y, GLsizei width, GLsizei height) = NULL; 224static void (*_sym_glScissor) (GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
225static void (*_sym_glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) = NULL; 225static void (*_sym_glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) = NULL;
226static void (*_sym_glShaderSource) (GLuint shader, GLsizei count, const char** string, const GLint* length) = NULL; 226static void (*_sym_glShaderSource) (GLuint shader, GLsizei count, const char* const* string, const GLint* length) = NULL;
227static void (*_sym_glStencilFunc) (GLenum func, GLint ref, GLuint mask) = NULL; 227static void (*_sym_glStencilFunc) (GLenum func, GLint ref, GLuint mask) = NULL;
228static void (*_sym_glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask) = NULL; 228static void (*_sym_glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask) = NULL;
229static void (*_sym_glStencilMask) (GLuint mask) = NULL; 229static void (*_sym_glStencilMask) (GLuint mask) = NULL;
@@ -3150,7 +3150,7 @@ patch_gles_shader(const char *source, int length, int *patched_len)
3150} 3150}
3151 3151
3152static void 3152static void
3153evgl_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length) 3153evgl_glShaderSource(GLuint shader, GLsizei count, const char* const* string, const GLint* length)
3154{ 3154{
3155 int i = 0, len = 0; 3155 int i = 0, len = 0;
3156 3156