glapi/glx: Emit direct GL calls instead of dispatch lookup

[mesa.git] / src / mapi / glapi / gen / Makefile.am

diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 2da8f7ddd9d4ef57d277f836ee6ef988cba28074..1e346321292e7dc995e02ea7f442c6f1a4ad83d3 100644 (file)
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -27,8 +27,11 @@ MESA_GLAPI_OUTPUTS = \
        $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \
        $(MESA_GLAPI_DIR)/glprocs.h \
        $(MESA_GLAPI_DIR)/glapitemp.h \
-       $(MESA_GLAPI_DIR)/glapitable.h \
-       $(MESA_GLAPI_DIR)/glapi_gentable.c
+       $(MESA_GLAPI_DIR)/glapitable.h
+
+if HAVE_APPLEDRI
+MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c
+endif
 
 MESA_GLAPI_ASM_OUTPUTS =
 if HAVE_X86_ASM
@@ -57,6 +60,7 @@ BUILT_SOURCES = \
        $(MESA_GLX_DIR)/indirect_size.c
 EXTRA_DIST= \
        $(BUILT_SOURCES) \
+       $(MESA_GLAPI_DIR)/glapi_gentable.c \
        $(MESA_GLAPI_DIR)/glapi_x86.S \
        $(MESA_GLAPI_DIR)/glapi_x86-64.S \
        $(MESA_GLAPI_DIR)/glapi_sparc.S \
@@ -85,14 +89,7 @@ EXTRA_DIST= \
 XORG_GLX_DIR = $(XORG_BASE)/glx
 XORG_GLAPI_DIR = $(XORG_BASE)/glx
 
-XORG_GLAPI_OUTPUTS = \
-       $(XORG_GLAPI_DIR)/glprocs.h \
-       $(XORG_GLAPI_DIR)/glapitable.h \
-       $(XORG_GLAPI_DIR)/dispatch.h \
-       $(XORG_GLAPI_DIR)/glapi_gentable.c
-
 XORG_OUTPUTS = \
-       $(XORG_GLAPI_OUTPUTS) \
        $(XORG_GLX_DIR)/indirect_dispatch.c \
        $(XORG_GLX_DIR)/indirect_dispatch_swap.c \
        $(XORG_GLX_DIR)/indirect_dispatch.h \
@@ -137,8 +134,10 @@ API_XML = \
        ARB_get_texture_sub_image.xml \
        ARB_gpu_shader_fp64.xml \
        ARB_gpu_shader5.xml \
+       ARB_indirect_parameters.xml \
        ARB_instanced_arrays.xml \
        ARB_internalformat_query.xml \
+       ARB_internalformat_query2.xml \
        ARB_invalidate_subdata.xml \
        ARB_map_buffer_range.xml \
        ARB_multi_bind.xml \
@@ -187,6 +186,7 @@ API_XML = \
        EXT_texture_array.xml \
        EXT_texture_integer.xml \
        EXT_transform_feedback.xml \
+       GREMEDY_string_marker.xml \
        INTEL_performance_query.xml \
        KHR_debug.xml \
        KHR_context_flush_control.xml \
@@ -319,7 +319,7 @@ $(XORG_GLX_DIR)/indirect_dispatch.h: glX_proto_recv.py gl_and_glX_API.xml $(COMM
 
 $(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX)
        $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_h \
-           --only-get -h '_INDIRECT_SIZE_GET_H_' \
+           --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
          | $(INDENT) $(XORG_INDENT_FLAGS) > $@
 
 $(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)
@@ -328,7 +328,7 @@ $(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)
 
 $(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX)
        $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_h \
-           --only-get -h '_INDIRECT_SIZE_GET_H_' \
+           --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
          | $(INDENT) $(XORG_INDENT_FLAGS) > $@
 
 $(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX)