Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mapi/glapi/gen/.gitignore

4 files changed, 152 insertions, 53 deletions

diff --git a/mesalib/src/mapi/glapi/gen/.gitignore b/mesalib/src/mapi/glapi/gen/.gitignore
index b209a3ec7..906ce45d9 100644
--- a/mesalib/src/mapi/glapi/gen/.gitignore
+++ b/mesalib/src/mapi/glapi/gen/.gitignore
@@ -1,22 +1,23 @@
-enums.c

-glapi_mapi_tmp.h

-mapi_abi.py

-remap_helper.h

-dispatch.h

-glapitable.h

-glapitemp.h

-glprocs.h

-indirect.c

-indirect.h

-indirect_dispatch.c

-indirect_dispatch.h

-indirect_dispatch_swap.c

-indirect_init.c

-indirect_reqsize.c

-indirect_reqsize.h

-indirect_size.c

-indirect_size.h

-indirect_size_get.c

-indirect_size_get.h

-indirect_table.c

-glapi_gentable.c

+enums.c
+glapi_mapi_tmp.h
+mapi_abi.py
+remap_helper.h
+dispatch.h
+glapitable.h
+glapitemp.h
+glprocs.h
+indirect.c
+indirect.h
+indirect_dispatch.c
+indirect_dispatch.h
+indirect_dispatch_swap.c
+indirect_init.c
+indirect_reqsize.c
+indirect_reqsize.h
+indirect_size.c
+indirect_size.h
+indirect_size_get.c
+indirect_size_get.h
+indirect_table.c
+glapi_gentable.c
+/Makefile
diff --git a/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml
new file mode 100644
index 000000000..cbcd339e7
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_uniform_buffer_object" number="57">
+
+<enum name="UNIFORM_BUFFER" value="0x8A11" />
+<enum name="UNIFORM_BUFFER_BINDING" value="0x8A28" />
+<enum name="UNIFORM_BUFFER_START" value="0x8A29" />
+<enum name="UNIFORM_BUFFER_SIZE" value="0x8A2A" />
+<enum name="MAX_VERTEX_UNIFORM_BLOCKS" value="0x8A2B" />
+<enum name="MAX_GEOMETRY_UNIFORM_BLOCKS" value="0x8A2C" />
+<enum name="MAX_FRAGMENT_UNIFORM_BLOCKS" value="0x8A2D" />
+<enum name="MAX_COMBINED_UNIFORM_BLOCKS" value="0x8A2E" />
+<enum name="MAX_UNIFORM_BUFFER_BINDINGS" value="0x8A2F" />
+<enum name="MAX_UNIFORM_BLOCK_SIZE" value="0x8A30" />
+<enum name="MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS" value="0x8A31" />
+<enum name="MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS" value="0x8A32" />
+<enum name="MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS" value="0x8A33" />
+<enum name="UNIFORM_BUFFER_OFFSET_ALIGNMENT" value="0x8A34" />
+<enum name="ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH" value="0x8A35" />
+<enum name="ACTIVE_UNIFORM_BLOCKS" value="0x8A36" />
+<enum name="UNIFORM_TYPE" value="0x8A37" />
+<enum name="UNIFORM_SIZE" value="0x8A38" />
+<enum name="UNIFORM_NAME_LENGTH" value="0x8A39" />
+<enum name="UNIFORM_BLOCK_INDEX" value="0x8A3A" />
+<enum name="UNIFORM_OFFSET" value="0x8A3B" />
+<enum name="UNIFORM_ARRAY_STRIDE" value="0x8A3C" />
+<enum name="UNIFORM_MATRIX_STRIDE" value="0x8A3D" />
+<enum name="UNIFORM_IS_ROW_MAJOR" value="0x8A3E" />
+<enum name="UNIFORM_BLOCK_BINDING" value="0x8A3F" />
+<enum name="UNIFORM_BLOCK_DATA_SIZE" value="0x8A40" />
+<enum name="UNFIROM_BLOCK_NAME_LENGTH" value="0x8A41" />
+<enum name="UNIFORM_BLOCK_ACTIVE_UNIFORMS" value="0x8A42" />
+<enum name="UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES" value="0x8A43" />
+<enum name="UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER" value="0x8A44" />
+<enum name="UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER" value="0x8A45" />
+<enum name="UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER" value="0x8A46" />
+<enum name="INVALID_INDEX" value="0xFFFFFFFF" />
+
+<function name="GetUniformIndices" offset="assign">
+    <param name="program" type="GLuint" />
+    <param name="uniformCount" type="GLsizei" />
+    <param name="uniformNames" type="const GLchar **" />
+    <param name="uniformIndices" type="GLuint *" />
+</function>
+
+<function name="GetActiveUniformsiv" offset="assign">
+    <param name="program" type="GLuint" />
+    <param name="uniformCount" type="GLsizei" />
+    <param name="uniformIndices" type="const GLuint *" />
+    <param name="pname" type="GLenum" />
+    <param name="params" type="GLint *" />
+</function>
+
+<function name="GetActiveUniformName" offset="assign">
+    <param name="program" type="GLuint" />
+    <param name="uniformIndex" type="GLuint" />
+    <param name="bufSize" type="GLsizei" />
+    <param name="length" type="GLsizei *" />
+    <param name="uniformName" type="GLchar *" />
+</function>
+
+<function name="GetUniformBlockIndex" offset="assign">
+    <return type="GLuint"/>
+    <param name="program" type="GLuint" />
+    <param name="uniformBlockName" type="const GLchar *" />
+</function>
+
+<function name="GetActiveUniformBlockiv" offset="assign">
+    <param name="program" type="GLuint" />
+    <param name="uniformBlockIndex" type="GLuint" />
+    <param name="pname" type="GLenum" />
+    <param name="params" type="GLint *" />
+</function>
+
+<function name="GetActiveUniformBlockName" offset="assign">
+    <param name="program" type="GLuint" />
+    <param name="uniformBlockIndex" type="GLuint" />
+    <param name="bufSize" type="GLsizei" />
+    <param name="length" type="GLsizei *" />
+    <param name="uniformBlockName" type="GLchar *" />
+</function>
+
+<!-- Duplicated with GL3x.xml: BindBufferRange, BindBufferBase,
+     GetIntegeri_v -->
+
+<function name="UniformBlockBinding" offset="assign" >
+    <param name="program" type="GLuint" />
+    <param name="uniformBlockIndex" type="GLuint" />
+    <param name="uniformBlockBinding" type="GLuint" />
+</function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile.am
index 0ac798957..d0d0a7ba0 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -5,7 +5,6 @@
 
 
 TOP = ../../../..
-include $(TOP)/configs/current
 
 MESA_DIR = $(TOP)/src/mesa
 MESA_GLAPI_DIR = $(TOP)/src/mapi/glapi
@@ -91,6 +90,7 @@ API_XML = \
 	ARB_vertex_type_2_10_10_10_rev.xml \
 	APPLE_object_purgeable.xml \
 	APPLE_vertex_array_object.xml \
+	ARB_uniform_buffer_object.xml \
 	EXT_draw_buffers2.xml \
 	EXT_framebuffer_object.xml \
 	EXT_gpu_shader4.xml \
@@ -120,12 +120,11 @@ COMMON_ES = \
 
 COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
 
-######################################################################
+PYTHON_GEN = $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS)
 
-default: mesa
-install: mesa
+######################################################################
 
-mesa: $(MESA_OUTPUTS)
+all-local: $(MESA_OUTPUTS)
 
 xorg: check-xorg-source $(XORG_OUTPUTS)
 
@@ -138,7 +137,7 @@ check-xorg-source:
 		exit 1; \
 	fi
 
-clean:
+clean-local:
 	-rm -f *~ *.pyo
 	-rm -f $(MESA_OUTPUTS)
 
@@ -156,86 +155,86 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
 ######################################################################
 
 $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON_ES)
-	$(PYTHON2) $(PYTHON_FLAGS) $< \
+	$(PYTHON_GEN) $< \
 		--printer glapi --mode lib gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 $(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 $(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 $(MESA_GLAPI_DIR)/glapi_gentable.c: gl_gentable.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 ######################################################################
 
 $(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 $(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 $(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 ######################################################################
 
 $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON_ES)
-	$(PYTHON2) $(PYTHON_FLAGS) $< -f gl_and_es_API.xml > $@
+	$(PYTHON_GEN) $< -f gl_and_es_API.xml > $@
 
 $(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
+	$(PYTHON_GEN) $< -m remap_table > $@
 
 $(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)
-	$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+	$(PYTHON_GEN) $< > $@
 
 ######################################################################
 
 $(MESA_GLX_DIR)/indirect.c: glX_proto_send.py $(COMMON_GLX)
-	$(PYTHON2) $(PYTHON_FLAGS) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@
+	$(PYTHON_GEN) $< -m proto | $(INDENT) $(INDENT_FLAGS) > $@
 
 $(MESA_GLX_DIR)/indirect.h: glX_proto_send.py $(COMMON_GLX)
-	$(PYTHON2) $(PYTHON_FLAGS) $< -m init_h > $@
+	$(PYTHON_GEN) $< -m init_h > $@
 
 $(MESA_GLX_DIR)/indirect_init.c: glX_proto_send.py $(COMMON_GLX)
-	$(PYTHON2) $(PYTHON_FLAGS) $< -m init_c > $@
+	$(PYTHON_GEN) $< -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_ \
+	$(PYTHON_GEN) $< -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 \
+	$(PYTHON_GEN) $< -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 > $@
+	$(PYTHON_GEN) $< -m dispatch_c > $@
 
 $(XORG_GLX_DIR)/indirect_dispatch_swap.c: glX_proto_recv.py $(COMMON_GLX)
-	$(PYTHON2) $(PYTHON_FLAGS) $< -m dispatch_c -s > $@
+	$(PYTHON_GEN) $< -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 > $@
+	$(PYTHON_GEN) $< -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_' \
+	$(PYTHON_GEN) $< -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) > $@
+	$(PYTHON_GEN) $< -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_' \
+	$(PYTHON_GEN) $< -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) > $@
+	$(PYTHON_GEN) $< -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 > $@
+	$(PYTHON_GEN) $< -f gl_and_glX_API.xml > $@
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 10b6ba91a..62799d399 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -7927,7 +7927,9 @@
 
 <!-- ARB extension number 55 is a GLX extension. -->
 <!-- ARB extension number 56 is a WGL extension. -->
-<!-- 57. GL_ARB_uniform_buffer_object -->
+
+<xi:include href="ARB_uniform_buffer_object.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!-- 58. GL_ARB_compatibility -->
 
 <xi:include href="ARB_copy_buffer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>