glapi: Move assembly dispatchers back into glapi/.

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

diff --git a/src/mesa/glapi/gen/Makefile b/src/mesa/glapi/gen/Makefile
index 8aa74ce434325b9b70b8ee9e10474848dbb399ca..289ffbde01df8b02fc50eb65d04d82e4b1e081c9 100644 (file)
--- a/src/mesa/glapi/gen/Makefile
+++ b/src/mesa/glapi/gen/Makefile
@@ -19,9 +19,9 @@ MESA_GLAPI_OUTPUTS = \
        $(MESA_GLAPI_DIR)/glapidispatch.h
 
 MESA_GLAPI_ASM_OUTPUTS = \
-       $(MESA_DIR)/x86/glapi_x86.S \
-       $(MESA_DIR)/x86-64/glapi_x86-64.S \
-       $(MESA_DIR)/sparc/glapi_sparc.S
+       $(MESA_GLAPI_DIR)/glapi_x86.S \
+       $(MESA_GLAPI_DIR)/glapi_x86-64.S \
+       $(MESA_GLAPI_DIR)/glapi_sparc.S
 
 MESA_OUTPUTS = \
        $(MESA_GLAPI_OUTPUTS) \
@@ -74,6 +74,7 @@ API_XML = \
        ARB_copy_buffer.xml \
        ARB_depth_clamp.xml \
        ARB_draw_elements_base_vertex.xml \
+       ARB_draw_instanced.xml \
        ARB_framebuffer_object.xml \
        ARB_map_buffer_range.xml \
        ARB_seamless_cube_map.xml \
@@ -86,6 +87,7 @@ API_XML = \
        EXT_packed_depth_stencil.xml \
        EXT_provoking_vertex.xml \
        EXT_texture_array.xml \
+       EXT_transform_feedback.xml \
        NV_conditional_render.xml \
        OES_EGL_image.xml
 
@@ -103,7 +105,7 @@ xorg: check-xorg-source $(XORG_OUTPUTS)
 
 check-xorg-source:
        @if ! test -d $(XORG_GLX_DIR); then \
-               echo "ERROR: Must specify path to xserver checkout; set XORG_BASE."; \
+               echo "ERROR: Must specify path to xserver/GL/GLX checkout; set XORG_GLX_DIR."; \
                exit 1; \
        fi
 
@@ -138,19 +140,21 @@ $(MESA_GLAPI_DIR)/glapidispatch.h: gl_table.py $(COMMON)
 
 ######################################################################
 
-$(MESA_DIR)/x86/glapi_x86.S: gl_x86_asm.py $(COMMON)
+$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-$(MESA_DIR)/x86-64/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
+$(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
-$(MESA_DIR)/sparc/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
+$(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@
 
 ######################################################################
 
-$(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON)
-       $(PYTHON2) $(PYTHON_FLAGS) $< > $@
+$(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON) $(ES_API)
+       $(PYTHON2) $(PYTHON_FLAGS) $< -f gl_API.xml \
+               -f $(MESA_DIR)/es/glapi/es1_API.xml \
+               -f $(MESA_DIR)/es/glapi/es2_API.xml > $@
 
 $(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)
        $(PYTHON2) $(PYTHON_FLAGS) $< > $@