svn merge ^/branches/released .

1 files changed, 228 insertions, 213 deletions

diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 570cc8547..51eaf7e93 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -1,213 +1,228 @@
-# This file isn't used during a normal compilation since we don't want to

-# require Python in order to compile Mesa.

-# Instead, when the Mesa developers update/change the API interface it's

-# up to him/her to re-run this makefile and check in the newly generated files.

-

-

-TOP = ../../../..

-include $(TOP)/configs/current

-

-MESA_DIR = $(TOP)/src/mesa

-MESA_GLAPI_DIR = $(TOP)/src/mapi/glapi

-MESA_GLX_DIR = $(TOP)/src/glx

-

-MESA_GLAPI_OUTPUTS = \

-	$(MESA_GLAPI_DIR)/glprocs.h \

-	$(MESA_GLAPI_DIR)/glapitemp.h \

-	$(MESA_GLAPI_DIR)/glapitable.h

-

-MESA_GLAPI_ASM_OUTPUTS = \

-	$(MESA_GLAPI_DIR)/glapi_x86.S \

-	$(MESA_GLAPI_DIR)/glapi_x86-64.S \

-	$(MESA_GLAPI_DIR)/glapi_sparc.S

-

-MESA_OUTPUTS = \

-	$(MESA_GLAPI_OUTPUTS) \

-	$(MESA_GLAPI_ASM_OUTPUTS) \

-	$(MESA_DIR)/main/enums.c \

-	$(MESA_DIR)/main/glapidispatch.h \

-	$(MESA_DIR)/main/remap_helper.h \

-	$(MESA_GLX_DIR)/indirect.c \

-	$(MESA_GLX_DIR)/indirect.h \

-	$(MESA_GLX_DIR)/indirect_init.c \

-	$(MESA_GLX_DIR)/indirect_size.h \

-	$(MESA_GLX_DIR)/indirect_size.c

-

-######################################################################

-

-XORG_GLX_DIR = $(XORG_BASE)/glx

-XORG_GLAPI_DIR = $(XORG_BASE)/glx

-

-XORG_GLAPI_FILES = \

-	$(XORG_GLAPI_DIR)/glapi.h \

-	$(XORG_GLAPI_DIR)/glapi.c \

-	$(XORG_GLAPI_DIR)/glapi_getproc.c \

-	$(XORG_GLAPI_DIR)/glapi_nop.c \

-	$(XORG_GLAPI_DIR)/glthread.c \

-	$(XORG_GLAPI_DIR)/glthread.h

-

-XORG_GLAPI_OUTPUTS = \

-	$(XORG_GLAPI_DIR)/glprocs.h \

-	$(XORG_GLAPI_DIR)/glapitemp.h \

-	$(XORG_GLAPI_DIR)/glapioffsets.h \

-	$(XORG_GLAPI_DIR)/glapitable.h \

-	$(XORG_GLAPI_DIR)/glapidispatch.h

-

-XORG_OUTPUTS = \

-	$(XORG_GLAPI_FILES) \

-	$(XORG_GLAPI_OUTPUTS) \

-	$(XORG_GLX_DIR)/indirect_dispatch.c \

-	$(XORG_GLX_DIR)/indirect_dispatch_swap.c \

-	$(XORG_GLX_DIR)/indirect_dispatch.h \

-	$(XORG_GLX_DIR)/indirect_reqsize.c \

-	$(XORG_GLX_DIR)/indirect_reqsize.h \

-	$(XORG_GLX_DIR)/indirect_size.h \

-	$(XORG_GLX_DIR)/indirect_size_get.c \

-	$(XORG_GLX_DIR)/indirect_size_get.h \

-	$(XORG_GLX_DIR)/indirect_table.c

-

-######################################################################

-

-API_XML = \

-	gl_API.xml \

-	ARB_copy_buffer.xml \

-	ARB_depth_clamp.xml \

-	ARB_draw_buffers_blend.xml \

-	ARB_draw_elements_base_vertex.xml \

-	ARB_draw_instanced.xml \

-	ARB_ES2_compatibility.xml \

-	ARB_framebuffer_object.xml \

-	ARB_geometry_shader4.xml \

-	ARB_instanced_arrays.xml \

-	ARB_map_buffer_range.xml \

-	ARB_seamless_cube_map.xml \

-	ARB_sync.xml \

-	ARB_vertex_array_object.xml \

-	APPLE_object_purgeable.xml \

-	APPLE_vertex_array_object.xml \

-	EXT_draw_buffers2.xml \

-	EXT_framebuffer_object.xml \

-	EXT_gpu_shader4.xml \

-	EXT_packed_depth_stencil.xml \

-	EXT_provoking_vertex.xml \

-	EXT_separate_shader_objects.xml \

-	EXT_texture_array.xml \

-	EXT_texture_integer.xml \

-	EXT_transform_feedback.xml \

-	NV_conditional_render.xml \

-	NV_primitive_restart.xml \

-	OES_EGL_image.xml \

-	GL3x.xml

-

-

-COMMON = $(API_XML) gl_XML.py glX_XML.py license.py typeexpr.py

-

-COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py

-

-######################################################################

-

-all: mesa xorg

-

-mesa: $(MESA_OUTPUTS)

-

-xorg: check-xorg-source $(XORG_OUTPUTS)

-

-check-xorg-source:

-	@if ! test -d $(XORG_GLX_DIR); then \

-		echo "ERROR: Must specify path to xserver/GL/ checkout; set XORG_BASE env var."; \

-		exit 1; \

-	fi

-

-clean:

-	-rm -f *~ *.pyo

-	-rm -f $(MESA_OUTPUTS)

-

-######################################################################

-

-$(XORG_GLAPI_DIR)/%.c: $(MESA_GLAPI_DIR)/%.c

-	cp $< $@

-

-$(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h

-	cp $< $@

-

-######################################################################

-

-$(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON)

-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@

-

-$(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON)

-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@

-

-$(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON)

-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@

-

-######################################################################

-

-$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)

-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@

-

-$(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)

-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@

-

-$(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.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_GLAPI_DIR)/gen-es/es1_API.xml \

-		-f $(MESA_GLAPI_DIR)/gen-es/es2_API.xml > $@

-

-$(MESA_DIR)/main/glapidispatch.h: gl_table.py $(COMMON)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@

-

-$(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)

-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@

-

-######################################################################

-

-$(MESA_GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@

-

-$(MESA_GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m init_h > $@

-

-$(MESA_GLX_DIR)/indirect_init.c: glX_proto_send.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m init_c > $@

-

-$(MESA_GLX_DIR)/indirect_size.h $(XORG_GLX_DIR)/indirect_size.h: glX_proto_size.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_h --only-set -h _INDIRECT_SIZE_H_ \

-	  | $(INDENT) $(INDENT_FLAGS) > $@

-

-$(MESA_GLX_DIR)/indirect_size.c: glX_proto_size.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_c --only-set \

-	  | $(INDENT) $(INDENT_FLAGS) > $@

-

-######################################################################

-

-$(XORG_GLX_DIR)/indirect_dispatch.c: glX_proto_recv.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m dispatch_c > $@

-

-$(XORG_GLX_DIR)/indirect_dispatch_swap.c: glX_proto_recv.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m dispatch_c -s > $@

-

-$(XORG_GLX_DIR)/indirect_dispatch.h: glX_proto_recv.py gl_and_glX_API.xml $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m dispatch_h -f gl_and_glX_API.xml -s > $@

-

-$(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' \

-	  | $(INDENT) $(INDENT_FLAGS) > $@

-

-$(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_c | $(INDENT) $(INDENT_FLAGS) > $@

-

-$(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m reqsize_h --only-get -h '_INDIRECT_SIZE_GET_H_' \

-	  | $(INDENT) $(INDENT_FLAGS) -l200 > $@

-

-$(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -m reqsize_c | $(INDENT) $(INDENT_FLAGS) > $@

-

-$(XORG_GLX_DIR)/indirect_table.c: glX_server_table.py gl_and_glX_API.xml $(COMMON_GLX)

-	$(PYTHON2) $(PYTHON_FLAGS) $< -f gl_and_glX_API.xml > $@

+# This file isn't used during a normal compilation since we don't want to
+# require Python in order to compile Mesa.
+# Instead, when the Mesa developers update/change the API interface it's
+# up to him/her to re-run this makefile and check in the newly generated files.
+
+
+TOP = ../../../..
+include $(TOP)/configs/current
+
+MESA_DIR = $(TOP)/src/mesa
+MESA_GLAPI_DIR = $(TOP)/src/mapi/glapi
+MESA_MAPI_DIR = $(TOP)/src/mapi/mapi
+MESA_GLX_DIR = $(TOP)/src/glx
+
+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_ASM_OUTPUTS = \
+	$(MESA_GLAPI_DIR)/glapi_x86.S \
+	$(MESA_GLAPI_DIR)/glapi_x86-64.S \
+	$(MESA_GLAPI_DIR)/glapi_sparc.S
+
+MESA_OUTPUTS = \
+	$(MESA_GLAPI_OUTPUTS) \
+	$(MESA_GLAPI_ASM_OUTPUTS) \
+	$(MESA_DIR)/main/enums.c \
+	$(MESA_DIR)/main/glapidispatch.h \
+	$(MESA_DIR)/main/remap_helper.h \
+	$(MESA_GLX_DIR)/indirect.c \
+	$(MESA_GLX_DIR)/indirect.h \
+	$(MESA_GLX_DIR)/indirect_init.c \
+	$(MESA_GLX_DIR)/indirect_size.h \
+	$(MESA_GLX_DIR)/indirect_size.c
+
+######################################################################
+
+XORG_GLX_DIR = $(XORG_BASE)/glx
+XORG_GLAPI_DIR = $(XORG_BASE)/glx
+
+XORG_GLAPI_FILES = \
+	$(XORG_GLAPI_DIR)/glapi.h \
+	$(XORG_GLAPI_DIR)/glapi.c \
+	$(XORG_GLAPI_DIR)/glapi_getproc.c \
+	$(XORG_GLAPI_DIR)/glapi_nop.c \
+	$(XORG_GLAPI_DIR)/glthread.c \
+	$(XORG_GLAPI_DIR)/glthread.h
+
+XORG_GLAPI_OUTPUTS = \
+	$(XORG_GLAPI_DIR)/glprocs.h \
+	$(XORG_GLAPI_DIR)/glapitemp.h \
+	$(XORG_GLAPI_DIR)/glapioffsets.h \
+	$(XORG_GLAPI_DIR)/glapitable.h \
+	$(XORG_GLAPI_DIR)/glapidispatch.h
+
+XORG_OUTPUTS = \
+	$(XORG_GLAPI_FILES) \
+	$(XORG_GLAPI_OUTPUTS) \
+	$(XORG_GLX_DIR)/indirect_dispatch.c \
+	$(XORG_GLX_DIR)/indirect_dispatch_swap.c \
+	$(XORG_GLX_DIR)/indirect_dispatch.h \
+	$(XORG_GLX_DIR)/indirect_reqsize.c \
+	$(XORG_GLX_DIR)/indirect_reqsize.h \
+	$(XORG_GLX_DIR)/indirect_size.h \
+	$(XORG_GLX_DIR)/indirect_size_get.c \
+	$(XORG_GLX_DIR)/indirect_size_get.h \
+	$(XORG_GLX_DIR)/indirect_table.c
+
+######################################################################
+
+API_XML = \
+	gl_API.xml \
+	ARB_copy_buffer.xml \
+	ARB_depth_clamp.xml \
+	ARB_draw_buffers_blend.xml \
+	ARB_draw_elements_base_vertex.xml \
+	ARB_draw_instanced.xml \
+	ARB_ES2_compatibility.xml \
+	ARB_framebuffer_object.xml \
+	ARB_geometry_shader4.xml \
+	ARB_instanced_arrays.xml \
+	ARB_map_buffer_range.xml \
+	ARB_seamless_cube_map.xml \
+	ARB_sync.xml \
+	ARB_vertex_array_object.xml \
+	APPLE_object_purgeable.xml \
+	APPLE_vertex_array_object.xml \
+	EXT_draw_buffers2.xml \
+	EXT_framebuffer_object.xml \
+	EXT_gpu_shader4.xml \
+	EXT_packed_depth_stencil.xml \
+	EXT_provoking_vertex.xml \
+	EXT_separate_shader_objects.xml \
+	EXT_texture_array.xml \
+	EXT_texture_integer.xml \
+	EXT_transform_feedback.xml \
+	NV_conditional_render.xml \
+	NV_primitive_restart.xml \
+	OES_EGL_image.xml \
+	GL3x.xml
+
+
+COMMON = $(API_XML) gl_XML.py glX_XML.py license.py typeexpr.py
+
+COMMON_ES = \
+	$(COMMON) \
+	gl_and_es_API.xml \
+	es_EXT.xml \
+	ARB_ES2_compatibility.xml \
+	ARB_get_program_binary.xml \
+	OES_fixed_point.xml \
+	OES_single_precision.xml
+
+COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
+
+######################################################################
+
+all: mesa xorg
+
+mesa: $(MESA_OUTPUTS)
+
+xorg: check-xorg-source $(XORG_OUTPUTS)
+
+check-xorg-source:
+	@if ! test -d $(XORG_GLX_DIR); then \
+		echo "ERROR: Must specify path to xserver/GL/ checkout; set XORG_BASE env var."; \
+		exit 1; \
+	fi
+
+clean:
+	-rm -f *~ *.pyo
+	-rm -f $(MESA_OUTPUTS)
+
+######################################################################
+
+$(XORG_GLAPI_DIR)/%.c: $(MESA_GLAPI_DIR)/%.c
+	cp $< $@
+
+$(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
+	cp $< $@
+
+######################################################################
+
+$(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON_ES)
+	$(PYTHON2) $(PYTHON_FLAGS) $< \
+		--printer glapi --mode lib gl_and_es_API.xml > $@
+
+$(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON)
+	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
+$(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON)
+	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
+$(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON)
+	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
+######################################################################
+
+$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
+	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
+$(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
+	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
+$(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.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_GLAPI_DIR)/gen-es/es1_API.xml \
+		-f $(MESA_GLAPI_DIR)/gen-es/es2_API.xml > $@
+
+$(MESA_DIR)/main/glapidispatch.h: gl_table.py $(COMMON)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
+
+$(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)
+	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
+######################################################################
+
+$(MESA_GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@
+
+$(MESA_GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m init_h > $@
+
+$(MESA_GLX_DIR)/indirect_init.c: glX_proto_send.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m init_c > $@
+
+$(MESA_GLX_DIR)/indirect_size.h $(XORG_GLX_DIR)/indirect_size.h: glX_proto_size.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_h --only-set -h _INDIRECT_SIZE_H_ \
+	  | $(INDENT) $(INDENT_FLAGS) > $@
+
+$(MESA_GLX_DIR)/indirect_size.c: glX_proto_size.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_c --only-set \
+	  | $(INDENT) $(INDENT_FLAGS) > $@
+
+######################################################################
+
+$(XORG_GLX_DIR)/indirect_dispatch.c: glX_proto_recv.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m dispatch_c > $@
+
+$(XORG_GLX_DIR)/indirect_dispatch_swap.c: glX_proto_recv.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m dispatch_c -s > $@
+
+$(XORG_GLX_DIR)/indirect_dispatch.h: glX_proto_recv.py gl_and_glX_API.xml $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m dispatch_h -f gl_and_glX_API.xml -s > $@
+
+$(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' \
+	  | $(INDENT) $(INDENT_FLAGS) > $@
+
+$(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m size_c | $(INDENT) $(INDENT_FLAGS) > $@
+
+$(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m reqsize_h --only-get -h '_INDIRECT_SIZE_GET_H_' \
+	  | $(INDENT) $(INDENT_FLAGS) -l200 > $@
+
+$(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -m reqsize_c | $(INDENT) $(INDENT_FLAGS) > $@
+
+$(XORG_GLX_DIR)/indirect_table.c: glX_server_table.py gl_and_glX_API.xml $(COMMON_GLX)
+	$(PYTHON2) $(PYTHON_FLAGS) $< -f gl_and_glX_API.xml > $@