Mesa (gallium-0.1): mesa: Correct the gl_dispatch_stub_xxx prototypes.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Apr 23 08:59:46 UTC 2009
Module: Mesa
Branch: gallium-0.1
Commit: f1129abb2de9bb12f3b6ba0c36326306fbb8fc7a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1129abb2de9bb12f3b6ba0c36326306fbb8fc7a
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Apr 20 15:40:12 2009 +0000
mesa: Correct the gl_dispatch_stub_xxx prototypes.
Conflicts:
src/mesa/glapi/glprocs.h
---
src/mesa/glapi/gl_procs.py | 3 +-
src/mesa/glapi/glprocs.h | 93 ++++++++++++++++++++++----------------------
2 files changed, 47 insertions(+), 49 deletions(-)
diff --git a/src/mesa/glapi/gl_procs.py b/src/mesa/glapi/gl_procs.py
index 96e59a5..cd1a68c 100644
--- a/src/mesa/glapi/gl_procs.py
+++ b/src/mesa/glapi/gl_procs.py
@@ -134,12 +134,11 @@ typedef struct {
print "#endif /* USE_MGL_NAMESPACE */"
print ''
print ''
- print '/* FIXME: Having these (incorrect) prototypes here is ugly. */'
print '#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)'
for func in api.functionIterateByOffset():
for n in func.entry_points:
if (not func.is_static_entry_point(func.name)) or (func.has_different_protocol(n) and not func.is_static_entry_point(n)):
- print 'extern void gl_dispatch_stub_%u(void);' % (func.offset)
+ print '%s GLAPIENTRY gl_dispatch_stub_%u(%s);' % (func.return_type, func.offset, func.get_parameter_string())
break
print '#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */'
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 5a99d50..ea28669 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -1154,54 +1154,53 @@ static const char gl_string_table[] =
#endif /* USE_MGL_NAMESPACE */
-/* FIXME: Having these (incorrect) prototypes here is ugly. */
#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)
-extern void gl_dispatch_stub_343(void);
-extern void gl_dispatch_stub_344(void);
-extern void gl_dispatch_stub_345(void);
-extern void gl_dispatch_stub_356(void);
-extern void gl_dispatch_stub_357(void);
-extern void gl_dispatch_stub_358(void);
-extern void gl_dispatch_stub_359(void);
-extern void gl_dispatch_stub_361(void);
-extern void gl_dispatch_stub_362(void);
-extern void gl_dispatch_stub_363(void);
-extern void gl_dispatch_stub_364(void);
-extern void gl_dispatch_stub_365(void);
-extern void gl_dispatch_stub_366(void);
-extern void gl_dispatch_stub_562(void);
-extern void gl_dispatch_stub_563(void);
-extern void gl_dispatch_stub_564(void);
-extern void gl_dispatch_stub_565(void);
-extern void gl_dispatch_stub_566(void);
-extern void gl_dispatch_stub_567(void);
-extern void gl_dispatch_stub_568(void);
-extern void gl_dispatch_stub_569(void);
-extern void gl_dispatch_stub_580(void);
-extern void gl_dispatch_stub_581(void);
-extern void gl_dispatch_stub_606(void);
-extern void gl_dispatch_stub_648(void);
-extern void gl_dispatch_stub_649(void);
-extern void gl_dispatch_stub_650(void);
-extern void gl_dispatch_stub_651(void);
-extern void gl_dispatch_stub_652(void);
-extern void gl_dispatch_stub_653(void);
-extern void gl_dispatch_stub_654(void);
-extern void gl_dispatch_stub_655(void);
-extern void gl_dispatch_stub_656(void);
-extern void gl_dispatch_stub_733(void);
-extern void gl_dispatch_stub_734(void);
-extern void gl_dispatch_stub_735(void);
-extern void gl_dispatch_stub_736(void);
-extern void gl_dispatch_stub_737(void);
-extern void gl_dispatch_stub_744(void);
-extern void gl_dispatch_stub_745(void);
-extern void gl_dispatch_stub_763(void);
-extern void gl_dispatch_stub_765(void);
-extern void gl_dispatch_stub_766(void);
-extern void gl_dispatch_stub_767(void);
-extern void gl_dispatch_stub_768(void);
-extern void gl_dispatch_stub_769(void);
+void GLAPIENTRY gl_dispatch_stub_343(GLenum target, GLenum format, GLenum type, GLvoid * table);
+void GLAPIENTRY gl_dispatch_stub_344(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_345(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type, GLvoid * image);
+void GLAPIENTRY gl_dispatch_stub_357(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_359(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span);
+void GLAPIENTRY gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
+void GLAPIENTRY gl_dispatch_stub_362(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
+void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_562(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_563(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_564(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_565(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_566(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_567(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_568(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_569(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_580(GLenum pname, GLdouble * params);
+void GLAPIENTRY gl_dispatch_stub_581(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_606(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_648(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_649(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_650(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_651(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_652(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_653(GLuint fence, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_654(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_655(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_656(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_733(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_734(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_735(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_736(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_737(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_744(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_745(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_763(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_765(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_766(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_767(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_768(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_769(GLuint id, GLenum pname, GLuint64EXT * params);
#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
static const glprocs_table_t static_functions[] = {
More information about the mesa-commit
mailing list