diff options
| author | Brian Paul <brianp@vmware.com> | 2010-03-17 08:44:09 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-03-17 08:44:54 -0600 |
| commit | 59e743b8d393f2bdf023e3a5ad8fe848a7459ec9 (patch) | |
| tree | d3ed80bf5fceadf70f5ef39cb64e24a24f43633e /src | |
| parent | 90fe8c39f18512d22cdf52cbaa3e86a94a831ee2 (diff) | |
| download | external_mesa3d-59e743b8d393f2bdf023e3a5ad8fe848a7459ec9.zip external_mesa3d-59e743b8d393f2bdf023e3a5ad8fe848a7459ec9.tar.gz external_mesa3d-59e743b8d393f2bdf023e3a5ad8fe848a7459ec9.tar.bz2 | |
glapi: fix assorted warnings
And replace some instances of GLuint with unsigned int to avoid pulling in
GL/gl.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/glapi/glapi_entrypoint.c | 6 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi_execmem.c | 1 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi_priv.h | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/mesa/glapi/glapi_entrypoint.c b/src/mesa/glapi/glapi_entrypoint.c index c4f43f6..239780e 100644 --- a/src/mesa/glapi/glapi_entrypoint.c +++ b/src/mesa/glapi/glapi_entrypoint.c @@ -56,7 +56,7 @@ extern const GLubyte gl_dispatch_functions_start[]; #if defined(DISPATCH_FUNCTION_SIZE) _glapi_proc -get_entrypoint_address(GLuint functionOffset) +get_entrypoint_address(unsigned int functionOffset) { return (_glapi_proc) (gl_dispatch_functions_start + (DISPATCH_FUNCTION_SIZE * functionOffset)); @@ -97,7 +97,7 @@ init_glapi_relocs( void ) * We need assembly language in order to accomplish this. */ _glapi_proc -generate_entrypoint(GLuint functionOffset) +generate_entrypoint(unsigned int functionOffset) { /* 32 is chosen as something of a magic offset. For x86, the dispatch * at offset 32 is the first one where the offset in the @@ -122,7 +122,7 @@ generate_entrypoint(GLuint functionOffset) * stub that was generated with the preceeding function. */ void -fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset) +fill_in_entrypoint_offset(_glapi_proc entrypoint, unsigned int offset) { GLubyte * const code = (GLubyte *) entrypoint; diff --git a/src/mesa/glapi/glapi_execmem.c b/src/mesa/glapi/glapi_execmem.c index 6a1fac5..57f00be 100644 --- a/src/mesa/glapi/glapi_execmem.c +++ b/src/mesa/glapi/glapi_execmem.c @@ -40,6 +40,7 @@ #endif #include "glapi/glthread.h" +#include "glapi/glapi_priv.h" #if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) diff --git a/src/mesa/glapi/glapi_priv.h b/src/mesa/glapi/glapi_priv.h index 0e2de46..da6fee6 100644 --- a/src/mesa/glapi/glapi_priv.h +++ b/src/mesa/glapi/glapi_priv.h @@ -27,6 +27,8 @@ #define _GLAPI_PRIV_H #include "glthread.h" +#include "glapi.h" + /* getproc */ @@ -42,7 +44,7 @@ _glapi_check_table(const struct _glapi_table *table); /* execmem */ extern void * -_glapi_exec_malloc(GLuint size); +_glapi_exec_malloc(unsigned int size); /* entrypoint */ @@ -52,15 +54,15 @@ init_glapi_relocs_once(void); extern _glapi_proc -generate_entrypoint(GLuint functionOffset); +generate_entrypoint(unsigned int functionOffset); extern void -fill_in_entrypoint_offset(_glapi_proc entrypoint, GLuint offset); +fill_in_entrypoint_offset(_glapi_proc entrypoint, unsigned int offset); extern _glapi_proc -get_entrypoint_address(GLuint functionOffset); +get_entrypoint_address(unsigned int functionOffset); /** |