diff options
author | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
---|---|---|
committer | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
tree | dee99970e9d1e6d892f21db31488470bc7929d18 /src/mesa/glapi/glapi.c | |
parent | dabd09f5a92e5497ac6ac9b4ba26f806ddb25206 (diff) | |
parent | 4fab47b13c214dc79e0ae5d8001521029ce34231 (diff) |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
Diffstat (limited to 'src/mesa/glapi/glapi.c')
-rw-r--r-- | src/mesa/glapi/glapi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index c4d101aee55..08a26980e19 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -63,6 +63,9 @@ #include <stdlib.h> #include <string.h> +#ifdef DEBUG +#include <assert.h> +#endif #include "glapi.h" #include "glapioffsets.h" @@ -737,7 +740,7 @@ add_function_name( const char * funcName ) * \returns * The offset in the dispatch table of the named function. A pointer to the * driver's implementation of the named function should be stored at - * \c dispatch_table[\c offset]. + * \c dispatch_table[\c offset]. Return -1 if error/problem. * * \sa glXGetProcAddress * @@ -786,7 +789,7 @@ _glapi_add_dispatch( const char * const * function_names, */ if (!function_names[i] || function_names[i][0] != 'g' || function_names[i][1] != 'l') - return GL_FALSE; + return -1; /* Determine if the named function already exists. If the function does * exist, it must have the same parameter signature as the function |