diff options
| author | Paul Berry <[email protected]> | 2012-11-06 07:26:56 -0800 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-11-12 10:53:57 -0800 |
| commit | bb3db388d8d4c7c2276a1db27fadaa1c57f1b39c (patch) | |
| tree | 1968d9110ee59da14f0fabbb8c189b8a7ecd255a | |
| parent | 1a1db1746db82efc7f0643508886dfc78a15eb71 (diff) | |
mesa: Fix const correctness of API implementation functions.
This patch changes the use of const in the type signatures of
_mesa_ShaderSource() and _mesa_TransformFeedbackVaryings(), to match
the type signatures in the GL spec. This avoids warnings when
building the code-generated api_exec.c file.
Note: previously we avoided the build warnings because these functions
were being type-checked against ShaderSourceARB and
TransformFeedbackVaryingsEXT; those functions are semantically
equivalent, but have fewer const qualifiers in their type signatures.
Acked-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/transformfeedback.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/transformfeedback.h | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 2d93e90a2a1..7271150154a 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1292,7 +1292,7 @@ read_shader(const char *fname) */ void GLAPIENTRY _mesa_ShaderSource(GLhandleARB shaderObj, GLsizei count, - const GLcharARB ** string, const GLint * length) + const GLcharARB * const * string, const GLint * length) { GET_CURRENT_CONTEXT(ctx); GLint *offsets; diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 64798bc2e23..8ee68d82da3 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -112,7 +112,7 @@ extern void GLAPIENTRY _mesa_LinkProgram(GLhandleARB programObj); extern void GLAPIENTRY -_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *); +_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* const *, const GLint *); extern void GLAPIENTRY _mesa_UseProgram(GLhandleARB); diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c index 52cb065c296..e0dd4e886e9 100644 --- a/src/mesa/main/transformfeedback.c +++ b/src/mesa/main/transformfeedback.c @@ -512,7 +512,8 @@ _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer, */ void GLAPIENTRY _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, - const GLchar **varyings, GLenum bufferMode) + const GLchar * const *varyings, + GLenum bufferMode) { struct gl_shader_program *shProg; GLint i; diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h index dec11ffa0d1..01c2af3599b 100644 --- a/src/mesa/main/transformfeedback.h +++ b/src/mesa/main/transformfeedback.h @@ -73,7 +73,8 @@ _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer, extern void GLAPIENTRY _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, - const GLchar **varyings, GLenum bufferMode); + const GLchar * const *varyings, + GLenum bufferMode); extern void GLAPIENTRY _mesa_GetTransformFeedbackVarying(GLuint program, GLuint index, |