diff options
| author | Chia-I Wu <[email protected]> | 2010-10-29 12:45:04 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-10-29 12:46:59 +0800 |
| commit | 9de5c6a1cb1428154c371f4331b55b5161957b50 (patch) | |
| tree | d4a40efee4d53646fb0350c7e4cf1472bd42a98c /src/mesa/main/es_generator.py | |
| parent | 815faa448cccc38aebb1b60ecf0bd7e6bf8f277e (diff) | |
| parent | b762db62c2972506fa78a5ed72f796113fc9b0d1 (diff) | |
Merge branch 'glapi-reorg'
Conflicts:
src/mapi/glapi/glapi_sparc.S
src/mapi/glapi/glapi_x86.S
src/mapi/glapi/glapidispatch.h
src/mapi/glapi/glapioffsets.h
src/mapi/glapi/glprocs.h
Diffstat (limited to 'src/mesa/main/es_generator.py')
| -rw-r--r-- | src/mesa/main/es_generator.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/main/es_generator.py b/src/mesa/main/es_generator.py index ecb34bb5cdf..8f28da16df8 100644 --- a/src/mesa/main/es_generator.py +++ b/src/mesa/main/es_generator.py @@ -219,9 +219,7 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... ); #ifndef GLAPIENTRY #define GLAPIENTRY GL_APIENTRY #endif -#include "%sapi/glapi/glapitable.h" -#include "%sapi/glapi/glapioffsets.h" -#include "%sapi/glapi/glapidispatch.h" +#include "%sapi/main/glapidispatch.h" #if FEATURE_remap_table @@ -249,7 +247,7 @@ _mesa_map_static_functions_%s(void) #endif typedef void (*_glapi_proc)(void); /* generic function pointer */ -""" % (shortname, shortname, shortname, shortname, shortname, shortname); +""" % (shortname, shortname, shortname, shortname); # Finally we get to the all-important functions print """/************************************************************* @@ -717,7 +715,7 @@ struct _glapi_table * _mesa_create_exec_table_%s(void) { struct _glapi_table *exec; - exec = _mesa_alloc_dispatch_table(sizeof *exec); + exec = _mesa_alloc_dispatch_table(_gloffset_COUNT); if (exec == NULL) return NULL; |