summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-07-08 09:22:48 -0600
committerBrian Paul <brianp@vmware.com>2013-07-12 08:32:51 -0600
commitcb2de08f27311166a44c379532a502c0b1b862d0 (patch)
tree21bafa3812f4b84fcc3e05ca7f59dc026cf5cff5 /src
parent5749aea255446b850a1b56f944a062358e5c70dd (diff)
mesa: update glext.h to version 20130708
This update fixes the problem with duplicated typedefs for GLclampf and GLclampd in the previous version. It also changes some parameter types for glDebugMessageCallbackARB() and glTransformFeedbackVaryingsEXT(). Note we should someday update the glapi-gen code so that it understands void pointer parameters. Currently, the Python code only understands "GLvoid *" but not "void *". Luckily, the compilers don't seem to complain about mixing GLvoid and void.
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/ARB_debug_output.xml2
-rw-r--r--src/mapi/glapi/gen/EXT_transform_feedback.xml2
-rw-r--r--src/mesa/main/errors.c2
-rw-r--r--src/mesa/main/errors.h2
-rw-r--r--src/mesa/main/getstring.c2
-rw-r--r--src/mesa/main/mtypes.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mapi/glapi/gen/ARB_debug_output.xml b/src/mapi/glapi/gen/ARB_debug_output.xml
index f2877a4f7d3..11f268dc640 100644
--- a/src/mapi/glapi/gen/ARB_debug_output.xml
+++ b/src/mapi/glapi/gen/ARB_debug_output.xml
@@ -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">
diff --git a/src/mapi/glapi/gen/EXT_transform_feedback.xml b/src/mapi/glapi/gen/EXT_transform_feedback.xml
index e4b310ec362..65259fc1fd4 100644
--- a/src/mapi/glapi/gen/EXT_transform_feedback.xml
+++ b/src/mapi/glapi/gen/EXT_transform_feedback.xml
@@ -55,7 +55,7 @@
<function name="TransformFeedbackVaryingsEXT" alias="TransformFeedbackVaryings">
<param name="program" type="GLuint"/>
<param name="count" type="GLsizei"/>
- <param name="varyings" type="const char **"/>
+ <param name="varyings" type="const GLchar * const *"/>
<param name="bufferMode" type="GLenum"/>
</function>
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 465420766f7..5a0758d0b9a 100644
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -659,7 +659,7 @@ _mesa_DebugMessageControlARB(GLenum gl_source, GLenum gl_type,
}
void GLAPIENTRY
-_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, GLvoid *userParam)
+_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const void *userParam)
{
GET_CURRENT_CONTEXT(ctx);
ctx->Debug.Callback = callback;
diff --git a/src/mesa/main/errors.h b/src/mesa/main/errors.h
index 4b376fb6075..5b4f36f5567 100644
--- a/src/mesa/main/errors.h
+++ b/src/mesa/main/errors.h
@@ -101,7 +101,7 @@ _mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity,
GLboolean enabled);
void GLAPIENTRY
_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback,
- GLvoid *userParam);
+ const void *userParam);
#ifdef __cplusplus
}
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 39fd260dcf7..0e075427fa0 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -262,7 +262,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
if (!_mesa_is_desktop_gl(ctx))
goto invalid_pname;
- *params = ctx->Debug.CallbackData;
+ *params = (GLvoid *) ctx->Debug.CallbackData;
break;
default:
goto invalid_pname;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f8b09df56e7..ea139ea58f9 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3330,7 +3330,7 @@ struct gl_debug_namespace
struct gl_debug_state
{
GLDEBUGPROCARB Callback;
- GLvoid *CallbackData;
+ const void *CallbackData;
GLboolean SyncOutput;
GLboolean Defaults[MESA_DEBUG_SEVERITY_COUNT][MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT];
struct gl_debug_namespace Namespaces[MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT];