added glapi and shader modules, misc updates
diff --git a/doxygen/Makefile b/doxygen/Makefile
index 4da21fa..055b173 100644
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -10,6 +10,8 @@
main.doxy \
math.doxy \
array_cache.doxy \
+ glapi.doxy \
+ shader.doxy \
swrast.doxy \
swrast_setup.doxy \
tnl.doxy \
diff --git a/doxygen/array_cache.doxy b/doxygen/array_cache.doxy
index 23296e1..ae0b1fa 100644
--- a/doxygen/array_cache.doxy
+++ b/doxygen/array_cache.doxy
@@ -41,9 +41,10 @@
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
TAGFILES = main.tag=../core \
- tnl.tag=../tnl \
- swrast_setup.tag=../swrast_setup \
- swrast.tag=../swrast \
math.tag=../math \
+ shader.tag=../shader \
+ swrast.tag=../swrast \
+ swrast_setup.tag=../swrast_setup \
+ tnl.tag=../tnl \
tnl_dd.tag=../tnl_dd
GENERATE_TAGFILE = array_cache.tag
diff --git a/doxygen/common.doxy b/doxygen/common.doxy
index 977cc58..1b5e5fe 100644
--- a/doxygen/common.doxy
+++ b/doxygen/common.doxy
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 6.1
+PROJECT_NUMBER = 6.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/doxygen/core_subset.doxy b/doxygen/core_subset.doxy
index ec63a7e..35faf56 100644
--- a/doxygen/core_subset.doxy
+++ b/doxygen/core_subset.doxy
@@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
# General configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = "Mesa Core"
+PROJECT_NAME = "Mesa Main"
PROJECT_NUMBER =
OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English
diff --git a/doxygen/doxy.bat b/doxygen/doxy.bat
index 9c4ecd7..2d8b567 100644
--- a/doxygen/doxy.bat
+++ b/doxygen/doxy.bat
@@ -5,10 +5,15 @@
doxygen swrast_setup.doxy
doxygen tnl.doxy
doxygen core.doxy
+doxygen glapi.doxy
+doxygen shader.doxy
+
echo Building again, to resolve tags
doxygen tnl_dd.doxy
doxygen array_cache.doxy
doxygen math.doxy
doxygen swrast.doxy
doxygen swrast_setup.doxy
-doxygen tnl.doxy
\ No newline at end of file
+doxygen tnl.doxy
+doxygen glapi.doxy
+doxygen shader.doxy
diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy
new file mode 100644
index 0000000..eafc2a1
--- /dev/null
+++ b/doxygen/glapi.doxy
@@ -0,0 +1,49 @@
+# Doxyfile 0.1
+
+@INCLUDE = common.doxy
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = "Mesa GL API dispatcher"
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = ../src/mesa/glapi/
+FILE_PATTERNS = *.c *.h
+RECURSIVE = NO
+EXCLUDE =
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+HTML_OUTPUT = glapi
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH = ../include/
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references
+#---------------------------------------------------------------------------
+TAGFILES = main.tag=../core \
+ math.tag=../math \
+ tnl_dd.tag=../tnl_dd \
+ swrast.tag=../swrast \
+ swrast_setup.tag=../swrast_setup \
+ tnl.tag=../tnl \
+ array_cache.tag=array_cache
+GENERATE_TAGFILE = swrast.tag
diff --git a/doxygen/header.html b/doxygen/header.html
index 3969315..3040ca7 100644
--- a/doxygen/header.html
+++ b/doxygen/header.html
@@ -2,9 +2,11 @@
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head>
<body><center>
-<a href="../main/index.html">core</a>
+<a href="../main/index.html">main</a>
+<a href="../glapi/index.html">glapi</a>
<a href="../array_cache/index.html">array_cache</a>
<a href="../math/index.html">math</a>
+<a href="../shader/index.html">shader</a>
<a href="../swrast/index.html">swrast</a>
<a href="../swrast_setup/index.html">swrast_setup</a>
<a href="../tnl/index.html">tnl</a>
diff --git a/doxygen/main.doxy b/doxygen/main.doxy
index fa0e676..3cb0596 100644
--- a/doxygen/main.doxy
+++ b/doxygen/main.doxy
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
# General configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = "Mesa Core / Main files"
+PROJECT_NAME = "Mesa Main"
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
@@ -41,7 +41,9 @@
#---------------------------------------------------------------------------
TAGFILES = tnl_dd.tag=../tnl_dd \
array_cache.tag=../array_cache \
+ glapi.tag=../glapi \
math.tag=../math \
+ shader.tag=../shader \
swrast.tag=../swrast \
swrast_setup.tag=../swrast_setup \
tnl.tag=../tnl
diff --git a/doxygen/shader.doxy b/doxygen/shader.doxy
new file mode 100644
index 0000000..44fc7c4
--- /dev/null
+++ b/doxygen/shader.doxy
@@ -0,0 +1,49 @@
+# Doxyfile 0.1
+
+@INCLUDE = common.doxy
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = "Mesa Vertex and Fragment Program code"
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = ../src/mesa/shader/
+FILE_PATTERNS = *.c *.h
+RECURSIVE = NO
+EXCLUDE =
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+HTML_OUTPUT = shader
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH = ../include/
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references
+#---------------------------------------------------------------------------
+TAGFILES = main.tag=../core \
+ math.tag=../math \
+ tnl_dd.tag=../tnl_dd \
+ swrast.tag=../swrast \
+ swrast_setup.tag=../swrast_setup \
+ tnl.tag=../tnl \
+ array_cache.tag=array_cache
+GENERATE_TAGFILE = swrast.tag
diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index c59e861..67f992f 100644
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -43,6 +43,7 @@
TAGFILES = tnl_dd.tag=../tnl \
main.tag=../core \
math.tag=../math \
+ shader.tag=../shader \
swrast.tag=../swrast \
swrast_setup.tag=swrast_setup \
array_cache.tag=array_cache
diff --git a/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy
index 1e74381..b7bd6e9 100644
--- a/doxygen/tnl_dd.doxy
+++ b/doxygen/tnl_dd.doxy
@@ -41,6 +41,7 @@
#---------------------------------------------------------------------------
TAGFILES = main.tag=../core \
math.tag=../math \
+ shader.tag=../shader \
swrast.tag=../swrast \
swrast_setup.tag=../swrast_setup \
tnl.tag=../tnl \