diff options
author | Ian Romanick <[email protected]> | 2015-05-19 11:24:26 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2015-05-28 16:56:32 -0700 |
commit | f20899b7276b73e1b60c3ed8d8abdf959e787c0c (patch) | |
tree | 1d6cd9151847c9ace0ab0cef06b3be24727995bb /src/mapi/glapi/gen/Makefile.am | |
parent | 5c4aab58ee79a8bfa3d96f3ec442f37da587ff45 (diff) |
glapi: Store exec table version info outside the XML
Currently on the functions that are exclusive to core-profile are
implemented. The remainder continue to live in the XML. Additional
functions can be moved later.
The functions for GL_ARB_draw_indirect and GL_ARB_multi_draw_indirect
are put in the dispatch table inside the VBO module, so they do not need
to be moved over.
The diff of src/mesa/main/api_exec.c before and after this patch is as
expected. All of the functions listed in apiexec.py moved out of a 'if
(_mesa_is_desktop(ctx))' block into a new 'if (ctx->API ==
API_OPENGL_CORE)' block.
v2: Remove stray shebang line in apiexec.py. Suggested by Ilia.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Cc: Dave Airlie <[email protected]>
Cc: Dylan Baker <[email protected]>
Cc: "10.6" <[email protected]>
Diffstat (limited to 'src/mapi/glapi/gen/Makefile.am')
-rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index d7742f7b9d4..34602579c8a 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -61,6 +61,7 @@ EXTRA_DIST= \ $(MESA_GLAPI_DIR)/glapi_x86-64.S \ $(MESA_GLAPI_DIR)/glapi_sparc.S \ $(COMMON_GLX) \ + apiexec.py \ gl_apitemp.py \ gl_enums.py \ gl_genexec.py \ @@ -267,7 +268,7 @@ $(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON) $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON) $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ -$(MESA_DIR)/main/api_exec.c: gl_genexec.py $(COMMON) +$(MESA_DIR)/main/api_exec.c: gl_genexec.py apiexec.py $(COMMON) $(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@ $(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON) |