LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix glShaderSource parameter constness

Browse Source 
Change-Id: I1008d779a9d333dc8968812d22e387b804e3c570
This commit is contained in:
Jesse Hall
2013-02-15 14:19:35 -08:00
parent b3ac0f9565
commit a0579871af
5 changed files with 221 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/emulator/opengl/system/GLESv2_enc/GL2Encoder.cpp
View File

@@ -633,7 +633,7 @@ static bool replaceSamplerExternalWith2D(char* const str, ShaderData* const data
return true;
}
void GL2Encoder::s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar **string, const GLint *length)
void GL2Encoder::s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)
{
GL2Encoder* ctx = (GL2Encoder*)self;
ShaderData* shaderData = ctx->m_shared->getShaderData(shader);

2
tools/emulator/opengl/system/GLESv2_enc/GL2Encoder.h
View File

@@ -117,7 +117,7 @@ private:
glGetVertexAttribPointerv_client_proc_t m_glGetVertexAttribPointerv;
static void s_glGetVertexAttribPointerv(void *self, GLuint index, GLenum pname, GLvoid **pointer);
static void s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar **string, const GLint *length);
static void s_glShaderSource(void *self, GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length);
static void s_glFinish(void *self);

2
tools/emulator/opengl/system/GLESv2_enc/gl2_client_proc.h
View File

@@ -107,7 +107,7 @@ typedef void (gl2_APIENTRY *glRenderbufferStorage_client_proc_t) (void * ctx, GL
typedef void (gl2_APIENTRY *glSampleCoverage_client_proc_t) (void * ctx, GLclampf, GLboolean);
typedef void (gl2_APIENTRY *glScissor_client_proc_t) (void * ctx, GLint, GLint, GLsizei, GLsizei);
typedef void (gl2_APIENTRY *glShaderBinary_client_proc_t) (void * ctx, GLsizei, const GLuint*, GLenum, const GLvoid*, GLsizei);
typedef void (gl2_APIENTRY *glShaderSource_client_proc_t) (void * ctx, GLuint, GLsizei, const GLchar**, const GLint*);
typedef void (gl2_APIENTRY *glShaderSource_client_proc_t) (void * ctx, GLuint, GLsizei, const GLchar* const*, const GLint*);
typedef void (gl2_APIENTRY *glStencilFunc_client_proc_t) (void * ctx, GLenum, GLint, GLuint);
typedef void (gl2_APIENTRY *glStencilFuncSeparate_client_proc_t) (void * ctx, GLenum, GLenum, GLint, GLuint);
typedef void (gl2_APIENTRY *glStencilMask_client_proc_t) (void * ctx, GLuint);

2
tools/emulator/opengl/system/GLESv2_enc/gl2_enc.h
View File

@@ -120,7 +120,7 @@ extern "C" {
void glSampleCoverage_enc(void *self , GLclampf value, GLboolean invert);
void glScissor_enc(void *self , GLint x, GLint y, GLsizei width, GLsizei height);
void glShaderBinary_enc(void *self , GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
void glShaderSource_enc(void *self , GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
void glShaderSource_enc(void *self , GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
void glStencilFunc_enc(void *self , GLenum func, GLint ref, GLuint mask);
void glStencilFuncSeparate_enc(void *self , GLenum face, GLenum func, GLint ref, GLuint mask);
void glStencilMask_enc(void *self , GLuint mask);

4
tools/emulator/opengl/system/GLESv2_enc/gl2_entry.cpp
View File

@@ -104,7 +104,7 @@ extern "C" {
void glSampleCoverage(GLclampf value, GLboolean invert);
void glScissor(GLint x, GLint y, GLsizei width, GLsizei height);
void glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
void glShaderSource(GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
void glShaderSource(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
void glStencilFunc(GLenum func, GLint ref, GLuint mask);
void glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
void glStencilMask(GLuint mask);
@@ -819,7 +819,7 @@ void glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const
ctx->glShaderBinary(ctx, n, shaders, binaryformat, binary, length);
}
void glShaderSource(GLuint shader, GLsizei count, const GLchar** string, const GLint* length)
void glShaderSource(GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length)
{
GET_CONTEXT;
ctx->glShaderSource(ctx, shader, count, string, length);