OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: more const qualifiers to match the latest glext.h

Browse Source 
For some reason regular gcc on Linux didn't catch these but the mingw
compiler did (generated errors, not warnings).

v2: include the changes in src/mapi/ too
This commit is contained in:
Brian Paul
2012-06-27 10:52:55 -06:00
parent 827bdee7d1
commit 9881bf6e69
10 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mapi/glapi/gen/ARB_debug_output.xml
View File

@@ -72,7 +72,7 @@
<function name="DebugMessageCallbackARB" offset="assign">
<param name="callback" type="GLDEBUGPROCARB"/>
<param name="userParam" type="GLvoid *"/>
<param name="userParam" type="const GLvoid *"/>
</function>
<function name="GetDebugMessageLogARB" offset="assign">

2
src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
View File

@@ -30,7 +30,7 @@
<param name="mode" type="GLenum"/>
<param name="count" type="const GLsizei *"/>
<param name="type" type="GLenum"/>
<param name="indices" type="const GLvoid **"/>
<param name="indices" type="const GLvoid * const *"/>
<param name="primcount" type="GLsizei"/>
<param name="basevertex" type="const GLint *"/>
</function>

2
src/mapi/glapi/gen/ARB_uniform_buffer_object.xml
View File

@@ -42,7 +42,7 @@
<function name="GetUniformIndices" offset="assign">
<param name="program" type="GLuint" />
<param name="uniformCount" type="GLsizei" />
<param name="uniformNames" type="const GLchar **" />
<param name="uniformNames" type="const GLchar * const *" />
<param name="uniformIndices" type="GLuint *" />
</function>

2
src/mapi/glapi/gen/GL3x.xml
View File

@@ -231,7 +231,7 @@
<function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT">
<param name="program" type="GLuint"/>
<param name="count" type="GLsizei"/>
<param name="varyings" type="const GLchar* *"/>
<param name="varyings" type="const GLchar * const *"/>
<param name="bufferMode" type="GLenum"/>
</function>

2
src/mapi/glapi/gen/gl_API.xml
View File

@@ -4677,7 +4677,7 @@
<param name="mode" type="GLenum"/>
<param name="count" type="const GLsizei *"/>
<param name="type" type="GLenum"/>
<param name="indices" type="const GLvoid **"/>
<param name="indices" type="const GLvoid * const *"/>
<param name="primcount" type="GLsizei"/>
</function>

2
src/mesa/main/dd.h
View File

@@ -1024,7 +1024,7 @@ typedef struct {
void (GLAPIENTRYP MultiDrawElementsBaseVertex)( GLenum mode,
const GLsizei *count,
GLenum type,
const GLvoid **indices,
const GLvoid * const *indices,
GLsizei primcount,
const GLint *basevertex);
void (GLAPIENTRYP DrawArraysInstanced)(GLenum mode, GLint first,

4
src/mesa/main/errors.c
View File

@@ -718,11 +718,11 @@ _mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity,
}
static void GLAPIENTRY
_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, GLvoid *userParam)
_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const GLvoid *userParam)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Debug.Callback = callback;
ctx->Debug.CallbackData = userParam;
ctx->Debug.CallbackData = (void *) userParam;
}
void

5
src/mesa/vbo/vbo_exec_array.c
View File

@@ -1149,7 +1149,8 @@ vbo_exec_DrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count,
static void
vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode,
const GLsizei *count, GLenum type,
const GLvoid **indices, GLsizei primcount,
const GLvoid * const *indices,
GLsizei primcount,
const GLint *basevertex)
{
struct vbo_context *vbo = vbo_context(ctx);
@@ -1290,7 +1291,7 @@ vbo_exec_MultiDrawElements(GLenum mode,
static void GLAPIENTRY
vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,
const GLsizei *count, GLenum type,
const GLvoid **indices,
const GLvoid * const *indices,
GLsizei primcount,
const GLsizei *basevertex)
{

2
src/mesa/vbo/vbo_noop.c
View File

@@ -404,7 +404,7 @@ _mesa_noop_DrawRangeElementsBaseVertex(GLenum mode,
static void GLAPIENTRY
_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei * count,
GLenum type,
const GLvoid ** indices,
const GLvoid * const *indices,
GLsizei primcount,
const GLint * basevertex)
{

4
src/mesa/vbo/vbo_save_api.c
View File

@@ -1042,7 +1042,7 @@ _save_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
static void GLAPIENTRY
_save_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
GLenum type, const GLvoid **indices,
GLenum type, const GLvoid * const *indices,
GLsizei primcount, const GLint *basevertex)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1255,7 +1255,7 @@ _save_OBE_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
static void GLAPIENTRY
_save_OBE_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
GLenum type,
const GLvoid **indices,
const GLvoid * const *indices,
GLsizei primcount,
const GLint *basevertex)
{