import Mesa 11.0.6

18 files changed, 89 insertions, 38 deletions

diff --git a/lib/mesa/doxygen/Makefile b/lib/mesa/doxygen/Makefile
index e5fac32cb..01c2691cf 100644
--- a/lib/mesa/doxygen/Makefile
+++ b/lib/mesa/doxygen/Makefile
@@ -12,21 +12,20 @@ FULL = \
 	vbo.doxy \
 	glapi.doxy \
 	glsl.doxy \
+	shader.doxy \
 	swrast.doxy \
 	swrast_setup.doxy \
 	tnl.doxy \
 	tnl_dd.doxy \
 	gbm.doxy \
-	i965.doxy \
-	nir.doxy
+	i965.doxy
 
 full: $(FULL:.doxy=.tag)
 	$(foreach FILE,$(FULL),doxygen $(FILE);)
 
 SUBSET = \
 	main.doxy \
-	math.doxy \
-	gallium.doxy
+	math.doxy
 
 subset: $(SUBSET:.doxy=.tag)
 	$(foreach FILE,$(SUBSET),doxygen $(FILE);)
diff --git a/lib/mesa/doxygen/common.doxy b/lib/mesa/doxygen/common.doxy
index eec59c41a..48f0c95d6 100644
--- a/lib/mesa/doxygen/common.doxy
+++ b/lib/mesa/doxygen/common.doxy
@@ -53,6 +53,16 @@ CREATE_SUBDIRS         = NO
 
 OUTPUT_LANGUAGE        = English
 
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -137,6 +147,13 @@ JAVADOC_AUTOBRIEF      = YES
 
 MULTILINE_CPP_IS_BRIEF = NO
 
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # re-implements.
@@ -590,6 +607,12 @@ HTML_FOOTER            =
 
 HTML_STYLESHEET        = 
 
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
 # Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
@@ -816,6 +839,18 @@ GENERATE_XML           = NO
 
 XML_OUTPUT             = xml
 
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
@@ -1069,6 +1104,22 @@ DOT_PATH               =
 
 DOTFILE_DIRS           = 
 
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
 # graphs generated by dot. A depth value of 3 means that only nodes reachable 
 # from the root by following a path via at most 3 edges will be shown. Nodes that 
diff --git a/lib/mesa/doxygen/core_subset.doxy b/lib/mesa/doxygen/core_subset.doxy
index 412348593..dfa59f4dd 100644
--- a/lib/mesa/doxygen/core_subset.doxy
+++ b/lib/mesa/doxygen/core_subset.doxy
@@ -190,7 +190,8 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
 TAGFILES		= \
-			 math_subset.tag=../math_subset
+			 math_subset.tag=../math_subset \
+			 miniglx.tag=../miniglx
 GENERATE_TAGFILE       = core_subset.tag
 ALLEXTERNALS           = NO
 PERL_PATH              = 
diff --git a/lib/mesa/doxygen/doxy.bat b/lib/mesa/doxygen/doxy.bat
index 408964e6b..331b93192 100644
--- a/lib/mesa/doxygen/doxy.bat
+++ b/lib/mesa/doxygen/doxy.bat
@@ -6,9 +6,7 @@ doxygen swrast_setup.doxy
 doxygen tnl.doxy
 doxygen core.doxy
 doxygen glapi.doxy
-doxygen glsl.doxy
-doxygen nir.doxy
-doxygen i965.doxy
+doxygen shader.doxy
 
 echo Building again, to resolve tags
 doxygen tnl_dd.doxy
@@ -17,8 +15,5 @@ doxygen math.doxy
 doxygen swrast.doxy
 doxygen swrast_setup.doxy
 doxygen tnl.doxy
-doxygen core.doxy
 doxygen glapi.doxy
-doxygen glsl.doxy
-doxygen nir.doxy
-doxygen i965.doxy
+doxygen shader.doxy
diff --git a/lib/mesa/doxygen/gbm.doxy b/lib/mesa/doxygen/gbm.doxy
index 537d68299..37e4aa05f 100644
--- a/lib/mesa/doxygen/gbm.doxy
+++ b/lib/mesa/doxygen/gbm.doxy
@@ -39,10 +39,10 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = main.tag=../main \
+TAGFILES               = main.tag=../core \
                          math.tag=../math \
                          tnl_dd.tag=../tnl_dd \
-                         swrast_setup.tag=../swrast_setup \
+                         swrast_setup.tag=../gbm_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=../vbo
+                         vbo.tag=vbo
 GENERATE_TAGFILE       = gbm.tag
diff --git a/lib/mesa/doxygen/glapi.doxy b/lib/mesa/doxygen/glapi.doxy
index 10046b9c3..3290f8455 100644
--- a/lib/mesa/doxygen/glapi.doxy
+++ b/lib/mesa/doxygen/glapi.doxy
@@ -9,7 +9,7 @@ PROJECT_NAME           = "Mesa GL API dispatcher"
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../src/mapi/glapi/
+INPUT                  = ../src/mesa/glapi/
 FILE_PATTERNS          = *.c *.h
 RECURSIVE              = NO
 EXCLUDE                = 
@@ -39,11 +39,11 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = main.tag=../main \
+TAGFILES               = main.tag=../core \
                          math.tag=../math \
                          tnl_dd.tag=../tnl_dd \
                          swrast.tag=../swrast \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=../vbo
-GENERATE_TAGFILE       = glapi.tag
+                         vbo.tag=vbo
+GENERATE_TAGFILE       = swrast.tag
diff --git a/lib/mesa/doxygen/glsl.doxy b/lib/mesa/doxygen/glsl.doxy
index ef71a4a02..9915ba28e 100644
--- a/lib/mesa/doxygen/glsl.doxy
+++ b/lib/mesa/doxygen/glsl.doxy
@@ -9,12 +9,11 @@ PROJECT_NAME           = "Mesa GLSL module"
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../src/compiler/glsl/
-FILE_PATTERNS          = *.c *.cpp *.h
+INPUT                  = ../src/glsl/
 RECURSIVE              = NO
-EXCLUDE                = ../src/compiler/glsl/glsl_lexer.cpp \
-                         ../src/compiler/glsl/glsl_parser.cpp \
-                         ../src/compiler/glsl/glsl_parser.h
+EXCLUDE                = ../src/glsl/glsl_lexer.cpp \
+                         ../src/glsl/glsl_parser.cpp \
+                         ../src/glsl/glsl_parser.h
 EXCLUDE_PATTERNS       =
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
diff --git a/lib/mesa/doxygen/header.html b/lib/mesa/doxygen/header.html
index 9f12b58bc..abd736fbf 100644
--- a/lib/mesa/doxygen/header.html
+++ b/lib/mesa/doxygen/header.html
@@ -8,9 +8,9 @@
 <a class="qindex" href="../main/index.html">core</a> |
 <a class="qindex" href="../glapi/index.html">glapi</a> |
 <a class="qindex" href="../glsl/index.html">glsl</a> |
-<a class="qindex" href="../nir/index.html">nir</a> |
 <a class="qindex" href="../vbo/index.html">vbo</a> |
 <a class="qindex" href="../math/index.html">math</a> |
+<a class="qindex" href="../shader/index.html">shader</a> |
 <a class="qindex" href="../swrast/index.html">swrast</a> |
 <a class="qindex" href="../swrast_setup/index.html">swrast_setup</a> |
 <a class="qindex" href="../tnl/index.html">tnl</a> |
diff --git a/lib/mesa/doxygen/header_subset.html b/lib/mesa/doxygen/header_subset.html
index 4dacc153d..f9a698db8 100644
--- a/lib/mesa/doxygen/header_subset.html
+++ b/lib/mesa/doxygen/header_subset.html
@@ -6,5 +6,6 @@
 <div class="qindex">
 <a class="qindex" href="../core_subset/index.html">Mesa Core</a> |
 <a class="qindex" href="../math_subset/index.html">math</a> |
+<a class="qindex" href="../miniglx/index.html">MiniGLX</a> |
 <a class="qindex" href="../radeon_subset/index.html">radeon_subset</a>
 </div>
diff --git a/lib/mesa/doxygen/i965.doxy b/lib/mesa/doxygen/i965.doxy
index 014245e58..a3aa2b607 100644
--- a/lib/mesa/doxygen/i965.doxy
+++ b/lib/mesa/doxygen/i965.doxy
@@ -46,5 +46,5 @@ TAGFILES               = glsl.tag=../glsl \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
                          tnl_dd.tag=../tnl_dd \
-                         vbo.tag=../vbo
+                         vbo.tag=vbo
 GENERATE_TAGFILE       = i965.tag
diff --git a/lib/mesa/doxygen/main.doxy b/lib/mesa/doxygen/main.doxy
index 0edcefa38..c2580319e 100644
--- a/lib/mesa/doxygen/main.doxy
+++ b/lib/mesa/doxygen/main.doxy
@@ -43,6 +43,7 @@ TAGFILES		= tnl_dd.tag=../tnl_dd \
 			 vbo.tag=../vbo \
                          glapi.tag=../glapi \
                          math.tag=../math \
+                         shader.tag=../shader \
                          swrast.tag=../swrast \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl
diff --git a/lib/mesa/doxygen/math.doxy b/lib/mesa/doxygen/math.doxy
index b26011244..388af40fe 100644
--- a/lib/mesa/doxygen/math.doxy
+++ b/lib/mesa/doxygen/math.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
 TAGFILES               = tnl_dd.tag=../tnl_dd \
-                         main.tag=../main \
+                         main.tag=../core \
                          swrast.tag=../swrast \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
diff --git a/lib/mesa/doxygen/radeon_subset.doxy b/lib/mesa/doxygen/radeon_subset.doxy
index ad4399ceb..fb9d0e953 100644
--- a/lib/mesa/doxygen/radeon_subset.doxy
+++ b/lib/mesa/doxygen/radeon_subset.doxy
@@ -168,7 +168,8 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 TAGFILES		= \
 			 core_subset.tag=../core_subset \
-                         math_subset.tag=../math_subset
+                         math_subset.tag=../math_subset \
+                         miniglx.tag=../miniglx
 GENERATE_TAGFILE       = radeon_subset.tag
 ALLEXTERNALS           = NO
 PERL_PATH              = 
diff --git a/lib/mesa/doxygen/swrast.doxy b/lib/mesa/doxygen/swrast.doxy
index cbab13064..fa07afd59 100644
--- a/lib/mesa/doxygen/swrast.doxy
+++ b/lib/mesa/doxygen/swrast.doxy
@@ -39,10 +39,10 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = main.tag=../main \
+TAGFILES               = main.tag=../core \
                          math.tag=../math \
                          tnl_dd.tag=../tnl_dd \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=../vbo
+                         vbo.tag=vbo
 GENERATE_TAGFILE       = swrast.tag
diff --git a/lib/mesa/doxygen/swrast_setup.doxy b/lib/mesa/doxygen/swrast_setup.doxy
index 314147641..ee6f3ffdc 100644
--- a/lib/mesa/doxygen/swrast_setup.doxy
+++ b/lib/mesa/doxygen/swrast_setup.doxy
@@ -41,7 +41,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
 TAGFILES               = tnl_dd.tag=../tnl_dd \
-                         main.tag=../main \
+                         main.tag=../core \
                          math.tag=../math \
                          swrast.tag=../swrast \
                          tnl.tag=../tnl \
diff --git a/lib/mesa/doxygen/tnl.doxy b/lib/mesa/doxygen/tnl.doxy
index e6d657200..a4f76a295 100644
--- a/lib/mesa/doxygen/tnl.doxy
+++ b/lib/mesa/doxygen/tnl.doxy
@@ -40,10 +40,11 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = tnl_dd.tag=../tnl_dd \
-                         main.tag=../main \
+TAGFILES               = tnl_dd.tag=../tnl \
+                         main.tag=../core \
                          math.tag=../math \
+                         shader.tag=../shader \
                          swrast.tag=../swrast \
-                         swrast_setup.tag=../swrast_setup \
-                         vbo.tag=../vbo
+                         swrast_setup.tag=swrast_setup \
+                         vbo.tag=vbo
 GENERATE_TAGFILE       = tnl.tag
diff --git a/lib/mesa/doxygen/tnl_dd.doxy b/lib/mesa/doxygen/tnl_dd.doxy
index 172e46f2d..b241f67f4 100644
--- a/lib/mesa/doxygen/tnl_dd.doxy
+++ b/lib/mesa/doxygen/tnl_dd.doxy
@@ -39,10 +39,11 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = main.tag=../main \
+TAGFILES               = main.tag=../core \
                          math.tag=../math \
+			 shader.tag=../shader \
                          swrast.tag=../swrast \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \
-                         vbo.tag=../vbo
+                         vbo.tag=vbo
 GENERATE_TAGFILE       = tnl_dd.tag
diff --git a/lib/mesa/doxygen/vbo.doxy b/lib/mesa/doxygen/vbo.doxy
index db00b3526..6dfb21cf4 100644
--- a/lib/mesa/doxygen/vbo.doxy
+++ b/lib/mesa/doxygen/vbo.doxy
@@ -40,8 +40,9 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = main.tag=../main \
+TAGFILES               = main.tag=../core \
 			 math.tag=../math \
+                         shader.tag=../shader \
 			 swrast.tag=../swrast \
 			 swrast_setup.tag=../swrast_setup \
 			 tnl.tag=../tnl \