forked from enlightenment/efl
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
This commit is contained in:
parent
5c7967827b
commit
de7dc1c2cc
|
@ -1393,7 +1393,7 @@ struct _Evas_GL_API
|
||||||
void (*glSampleCoverage) (GLclampf value, GLboolean invert);
|
void (*glSampleCoverage) (GLclampf value, GLboolean invert);
|
||||||
void (*glScissor) (GLint x, GLint y, GLsizei width, GLsizei height);
|
void (*glScissor) (GLint x, GLint y, GLsizei width, GLsizei height);
|
||||||
void (*glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length);
|
void (*glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length);
|
||||||
void (*glShaderSource) (GLuint shader, GLsizei count, const char** string, const GLint* length);
|
void (*glShaderSource) (GLuint shader, GLsizei count, const char* const * string, const GLint* length);
|
||||||
void (*glStencilFunc) (GLenum func, GLint ref, GLuint mask);
|
void (*glStencilFunc) (GLenum func, GLint ref, GLuint mask);
|
||||||
void (*glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask);
|
void (*glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask);
|
||||||
void (*glStencilMask) (GLuint mask);
|
void (*glStencilMask) (GLuint mask);
|
||||||
|
|
|
@ -1497,7 +1497,7 @@ _evgld_glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, con
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
_evgld_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
|
_evgld_glShaderSource(GLuint shader, GLsizei count, const char* const * string, const GLint* length)
|
||||||
{
|
{
|
||||||
EVGL_FUNC_BEGIN();
|
EVGL_FUNC_BEGIN();
|
||||||
glShaderSource(shader, count, string, length);
|
glShaderSource(shader, count, string, length);
|
||||||
|
@ -2093,7 +2093,7 @@ shadersrc_gles_to_gl(GLsizei count, const char** string, char **s, const GLint*
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
_evgld_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
|
_evgld_glShaderSource(GLuint shader, GLsizei count, const char* const* string, const GLint* length)
|
||||||
{
|
{
|
||||||
EVGL_FUNC_BEGIN();
|
EVGL_FUNC_BEGIN();
|
||||||
|
|
||||||
|
|
|
@ -223,7 +223,7 @@ static void (*_sym_glRenderbufferStorage) (GLenum target,
|
||||||
static void (*_sym_glSampleCoverage) (GLclampf value, GLboolean invert) = NULL;
|
static void (*_sym_glSampleCoverage) (GLclampf value, GLboolean invert) = NULL;
|
||||||
static void (*_sym_glScissor) (GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
|
static void (*_sym_glScissor) (GLint x, GLint y, GLsizei width, GLsizei height) = NULL;
|
||||||
static void (*_sym_glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) = NULL;
|
static void (*_sym_glShaderBinary) (GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) = NULL;
|
||||||
static void (*_sym_glShaderSource) (GLuint shader, GLsizei count, const char** string, const GLint* length) = NULL;
|
static void (*_sym_glShaderSource) (GLuint shader, GLsizei count, const char* const* string, const GLint* length) = NULL;
|
||||||
static void (*_sym_glStencilFunc) (GLenum func, GLint ref, GLuint mask) = NULL;
|
static void (*_sym_glStencilFunc) (GLenum func, GLint ref, GLuint mask) = NULL;
|
||||||
static void (*_sym_glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask) = NULL;
|
static void (*_sym_glStencilFuncSeparate) (GLenum face, GLenum func, GLint ref, GLuint mask) = NULL;
|
||||||
static void (*_sym_glStencilMask) (GLuint mask) = NULL;
|
static void (*_sym_glStencilMask) (GLuint mask) = NULL;
|
||||||
|
@ -3150,7 +3150,7 @@ patch_gles_shader(const char *source, int length, int *patched_len)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
evgl_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
|
evgl_glShaderSource(GLuint shader, GLsizei count, const char* const* string, const GLint* length)
|
||||||
{
|
{
|
||||||
int i = 0, len = 0;
|
int i = 0, len = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue