Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/src/OpenDis.c
	libX11/src/xcb_io.c
	xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
	xorg-server/xkeyboard-config/semantics/default.in

6 files changed, 103 insertions, 3 deletions

diff --git a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
new file mode 100644
index 000000000..f2877a4f7
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_debug_output" number="104">
+
+    <!-- glEnable/Disable/IsEnabled -->
+    <enum name="DEBUG_OUTPUT_SYNCHRONOUS_ARB"              value="0x8242"/>
+
+    <!-- glGetIntegerv -->
+    <enum name="MAX_DEBUG_MESSAGE_LENGTH_ARB"    count="1" value="0x9143">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="MAX_DEBUG_LOGGED_MESSAGES_ARB"   count="1" value="0x9144">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="DEBUG_LOGGED_MESSAGES_ARB"       count="1" value="0x9145">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB" count="1" value="0x8243">
+        <size name="Get" mode="get"/>
+    </enum>
+
+    <!-- glGetPointerv -->
+    <enum name="DEBUG_CALLBACK_FUNCTION_ARB"     count="1" value="0x8244">
+        <size name="GetPointerv" mode="get"/>
+    </enum>
+    <enum name="DEBUG_CALLBACK_USER_PARAM_ARB"   count="1" value="0x8245">
+        <size name="GetPointerv" mode="get"/>
+    </enum>
+
+    <enum name="DEBUG_SOURCE_API_ARB"                      value="0x8246"/>
+    <enum name="DEBUG_SOURCE_WINDOW_SYSTEM_ARB"            value="0x8247"/>
+    <enum name="DEBUG_SOURCE_SHADER_COMPILER_ARB"          value="0x8248"/>
+    <enum name="DEBUG_SOURCE_THIRD_PARTY_ARB"              value="0x8249"/>
+    <enum name="DEBUG_SOURCE_APPLICATION_ARB"              value="0x824A"/>
+    <enum name="DEBUG_SOURCE_OTHER_ARB"                    value="0x824B"/>
+
+    <enum name="DEBUG_TYPE_ERROR_ARB"                      value="0x824C"/>
+    <enum name="DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB"        value="0x824D"/>
+    <enum name="DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB"         value="0x824E"/>
+    <enum name="DEBUG_TYPE_PORTABILITY_ARB"                value="0x824F"/>
+    <enum name="DEBUG_TYPE_PERFORMANCE_ARB"                value="0x8250"/>
+    <enum name="DEBUG_TYPE_OTHER_ARB"                      value="0x8251"/>
+
+    <enum name="DEBUG_SEVERITY_HIGH_ARB"                   value="0x9146"/>
+    <enum name="DEBUG_SEVERITY_MEDIUM_ARB"                 value="0x9147"/>
+    <enum name="DEBUG_SEVERITY_LOW_ARB"                    value="0x9148"/>
+
+
+    <function name="DebugMessageControlARB" offset="assign">
+        <param name="source" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="severity" type="GLenum"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="ids" type="const GLuint *" count="count"/>
+        <param name="enabled" type="GLboolean"/>
+    </function>
+
+    <function name="DebugMessageInsertARB" offset="assign">
+        <param name="source" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="id" type="GLuint"/>
+        <param name="severity" type="GLenum"/>
+        <param name="length" type="GLsizei"/>
+        <param name="buf" type="const GLcharARB *"/>
+    </function>
+
+    <function name="DebugMessageCallbackARB" offset="assign">
+        <param name="callback" type="GLDEBUGPROCARB"/>
+        <param name="userParam" type="GLvoid *"/>
+    </function>
+
+    <function name="GetDebugMessageLogARB" offset="assign">
+        <return type="GLuint"/>
+        <param name="count" type="GLuint"/>
+        <param name="bufsize" type="GLsizei"/>
+        <param name="sources" type="GLenum *" output="true"/>
+        <param name="types" type="GLenum *" output="true"/>
+        <param name="ids" type="GLuint *" output="true"/>
+        <param name="severities" type="GLenum *" output="true"/>
+        <param name="lengths" type="GLsizei *" output="true"/>
+        <param name="messageLog" type="GLcharARB *" output="true"/>
+    </function>
+
+</category>
+
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index c409285dd..44939e354 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -65,6 +65,7 @@ API_XML = \
 	gl_API.xml \
 	ARB_color_buffer_float.xml \
 	ARB_copy_buffer.xml \
+	ARB_debug_output.xml \
 	ARB_depth_clamp.xml \
 	ARB_draw_buffers_blend.xml \
 	ARB_draw_elements_base_vertex.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd
index 30c646c92..149a433ca 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.dtd
+++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd
@@ -26,6 +26,7 @@
                    size                NMTOKEN #REQUIRED
 		   float               (true | false) "false"
 		   unsigned            (true | false) "false"
+		   pointer             (true | false) "false"
                    glx_name            NMTOKEN #IMPLIED>
 <!ATTLIST enum     name                NMTOKEN #REQUIRED
                    count               CDATA   #IMPLIED
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 083fb3cd1..b6d4a1d59 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -1106,6 +1106,8 @@
     
     <type name="void"    size="1"/>
 
+    <type name="DEBUGPROCARB" size="4" pointer="true"/>
+
     <function name="NewList" offset="0">
         <param name="list" type="GLuint"/>
         <param name="mode" type="GLenum"/>
@@ -7925,6 +7927,8 @@
 
 <xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="ARB_debug_output.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- Non-ARB extensions sorted by extension number. -->
diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py
index 4dc2e8fa7..340a581f1 100644
--- a/mesalib/src/mapi/glapi/gen/gl_XML.py
+++ b/mesalib/src/mapi/glapi/gen/gl_XML.py
@@ -340,6 +340,7 @@ class gl_type( gl_item ):
 		tn.size = int( element.nsProp( "size", None ), 0 )
 		tn.integer = not is_attr_true( element, "float" )
 		tn.unsigned = is_attr_true( element, "unsigned" )
+		tn.pointer = is_attr_true( element, "pointer" )
 		tn.name = "GL" + self.name
 		te.set_base_type_node( tn )
 
diff --git a/mesalib/src/mapi/glapi/gen/typeexpr.py b/mesalib/src/mapi/glapi/gen/typeexpr.py
index 8ba7de486..7836b2739 100644
--- a/mesalib/src/mapi/glapi/gen/typeexpr.py
+++ b/mesalib/src/mapi/glapi/gen/typeexpr.py
@@ -252,7 +252,7 @@ class type_expression:
 
 
 	def get_stack_size(self):
-		tn = self.expr[ len(self.expr) - 1 ]
+		tn = self.expr[ -1 ]
 
 		if tn.elements or tn.pointer:
 			return 4
@@ -263,12 +263,12 @@ class type_expression:
 
 
 	def is_pointer(self):
-		tn = self.expr[ len(self.expr) - 1 ]
+		tn = self.expr[ -1 ]
 		return tn.pointer
 
 
 	def format_string(self):
-		tn = self.expr[ len(self.expr) - 1 ]
+		tn = self.expr[ -1 ]
 		if tn.pointer:
 			return "%p"
 		elif not tn.integer: