diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-10-13 17:34:01 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-10-13 17:34:01 +0000 |
| commit | 461651357713b1408400669d6a809f2e367182fe (patch) | |
| tree | aaa5333418ef8d20761c106169a63d731ce9b0d7 | |
| parent | 176501dfff14b5bec78af2b3487207d42c26d37a (diff) | |
Fix dumb build errors.
I always build with -DGLX_USE_TLS, so I never hit these paths. glapi.h is
required in some places because _glapi_Dispatch is declared there, but
_glapi_tls_Dispatch is declared in glthread.h.
| -rw-r--r-- | src/glx/x11/singlepix.c | 1 | ||||
| -rw-r--r-- | src/mesa/glapi/glapi.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/glx/x11/singlepix.c b/src/glx/x11/singlepix.c index 5eeb4cedab..a7b5b79870 100644 --- a/src/glx/x11/singlepix.c +++ b/src/glx/x11/singlepix.c @@ -37,6 +37,7 @@ #include "packsingle.h" #include "indirect.h" #include "dispatch.h" +#include "glapi.h" #include "glthread.h" #include "glapioffsets.h" #include <GL/glxproto.h> diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index be5a7fe6ba..d1ccc5fba6 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -433,7 +433,7 @@ get_static_proc_address(const char *funcName) #if defined(DISPATCH_FUNCTION_SIZE) && defined(GLX_INDIRECT_RENDERING) return (f->Address == NULL) ? (_glapi_proc) (gl_dispatch_functions_start - + (DISPATCH_FUNCTION_SIZE * f->Offset)); + + (DISPATCH_FUNCTION_SIZE * f->Offset)) : f->Address; #elif defined(DISPATCH_FUNCTION_SIZE) return (_glapi_proc) (gl_dispatch_functions_start |