Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	libX11/configure.ac
	libX11/specs/libX11/AppC.xml
	libX11/specs/libX11/AppD.xml
	libX11/specs/libX11/CH03.xml
	libX11/specs/libX11/CH04.xml
	libX11/specs/libX11/CH05.xml
	libX11/specs/libX11/CH06.xml
	libX11/specs/libX11/CH07.xml
	libX11/specs/libX11/CH08.xml
	libX11/specs/libX11/CH09.xml
	libX11/specs/libX11/CH11.xml
	libX11/specs/libX11/CH12.xml
	libX11/specs/libX11/CH13.xml
	libX11/specs/libX11/CH14.xml
	libX11/specs/libX11/CH15.xml
	libX11/specs/libX11/CH16.xml
	libxcb/configure.ac
	libxcb/src/c_client.py
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_util.c
	mesalib/common.py
	mesalib/configs/linux-dri
	mesalib/docs/GL3.txt
	mesalib/docs/download.html
	mesalib/docs/install.html
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp-parse.y
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_clone.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/glsl/opt_tree_grafting.cpp
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_XML.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mapi/mapi/u_thread.c
	mesalib/src/mapi/mapi/u_thread.h
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
	mesalib/src/mesa/main/api_arrayelt.c
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pbo.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shared.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/program/register_allocate.c
	mesalib/src/mesa/program/register_allocate.h
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/tnl/t_draw.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	pixman/pixman/pixman-arm-common.h
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-inlines.h
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h
	xorg-server/configure.ac
	xorg-server/fb/fbblt.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 39 insertions, 7 deletions

diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py
index 4bf2d02ba..96bb039b7 100644
--- a/mesalib/src/mapi/glapi/gen/gl_XML.py
+++ b/mesalib/src/mapi/glapi/gen/gl_XML.py
@@ -618,7 +618,7 @@ class gl_function( gl_item ):
 		# for each entry-point.  Otherwise, they may generate code

 		# that won't compile.

 

-		self.parameter_strings = {}

+		self.entry_point_parameters = {}

 

 		self.process_element( element )

 

@@ -703,12 +703,34 @@ class gl_function( gl_item ):
 

 		if element.children:

 			self.initialized = 1

-			self.parameter_strings[name] = create_parameter_string(parameters, 1)

+			self.entry_point_parameters[name] = parameters

 		else:

-			self.parameter_strings[name] = None

+			self.entry_point_parameters[name] = []

 

 		return

 

+	def filter_entry_points(self, entry_point_list):

+		"""Filter out entry points not in entry_point_list."""

+		if not self.initialized:

+			raise RuntimeError('%s is not initialized yet' % self.name)

+

+		entry_points = []

+		for ent in self.entry_points:

+			if ent not in entry_point_list:

+				if ent in self.static_entry_points:

+					self.static_entry_points.remove(ent)

+				self.entry_point_parameters.pop(ent)

+			else:

+				entry_points.append(ent)

+

+		if not entry_points:

+			raise RuntimeError('%s has no entry point after filtering' % self.name)

+

+		self.entry_points = entry_points

+		if self.name not in entry_points:

+			# use the first remaining entry point

+			self.name = entry_points[0]

+			self.parameters = self.entry_point_parameters[entry_points[0]]

 

 	def get_images(self):

 		"""Return potentially empty list of input images."""

@@ -721,11 +743,11 @@ class gl_function( gl_item ):
 

 	def get_parameter_string(self, entrypoint = None):

 		if entrypoint:

-			s = self.parameter_strings[ entrypoint ]

-			if s:

-				return s

+			params = self.entry_point_parameters[ entrypoint ]

+		else:

+			params = self.parameters

 		

-		return create_parameter_string( self.parameters, 1 )

+		return create_parameter_string( params, 1 )

 

 	def get_called_parameter_string(self):

 		p_string = ""

@@ -791,6 +813,16 @@ class gl_api:
 		typeexpr.create_initial_types()

 		return

 

+	def filter_functions(self, entry_point_list):

+		"""Filter out entry points not in entry_point_list."""

+		functions_by_name = {}

+		for func in self.functions_by_name.itervalues():

+			entry_points = [ent for ent in func.entry_points if ent in entry_point_list]

+			if entry_points:

+				func.filter_entry_points(entry_points)

+				functions_by_name[func.name] = func

+

+		self.functions_by_name = functions_by_name

 

 	def process_element(self, doc):

 		element = doc.children