doxygen: Remove src/mesa/shader/ references

Mesa has not had a src/mesa/shader/ folder since Mesa 7.9 removed it
in October 2010, as part of a revised GLSL compiler written by Intel.

Remove doxygen/shader.doxy and consequential changes made throughout.

In addition to removing an unnecessary Doxygen doxyfile, this change also
avoids a bug in the consolidated Doxygen output caused by
doxygen/shader.doxy inadvertently overwriting doxygen/swrast.tag via its
GENERATE_TAGFILE setting.

This bug depended upon the specific order each *.tag was built.

Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index a5f3921b445ed71787e45967d034ef928ae64f46..1c186cb7285a0b2000712275a2c9a0cf63334720 100644 (file)
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -17,7 +17,6 @@ miniglx
 radeondrm
 radeonfb
 radeon_subset
-shader
 swrast
 swrast_setup
 tnl

diff --git a/doxygen/Makefile b/doxygen/Makefile
index 01c2691cfe00975b49d0e917bfef191175127800..b1bc15d5a05e65200d9c3b7486a417389c36e522 100644 (file)
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -12,7 +12,6 @@ FULL = \
        vbo.doxy \
        glapi.doxy \
        glsl.doxy \
-       shader.doxy \
        swrast.doxy \
        swrast_setup.doxy \
        tnl.doxy \

diff --git a/doxygen/doxy.bat b/doxygen/doxy.bat
index 331b931928e809c9a744c640877e795533f4ac55..e566ca3f7b8e087f5c05b2f32c9249a2f217b632 100644 (file)
--- a/doxygen/doxy.bat
+++ b/doxygen/doxy.bat
@@ -6,7 +6,6 @@ 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
@@ -16,4 +15,3 @@ doxygen swrast.doxy
 doxygen swrast_setup.doxy
 doxygen tnl.doxy
 doxygen glapi.doxy
-doxygen shader.doxy

diff --git a/doxygen/header.html b/doxygen/header.html
index abd736fbff51e8703905cbce0171e99ce35d0fcc..034231cbdfd9ec4109796e34777040475d21ecc3 100644 (file)
--- a/doxygen/header.html
+++ b/doxygen/header.html
@@ -10,7 +10,6 @@
 <a class="qindex" href="../glsl/index.html">glsl</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/doxygen/main.doxy b/doxygen/main.doxy
index c2580319e38e24f3b96351fe08836015fccb51ef..0edcefa38945936a81fa757a1d6bc493257aae31 100644 (file)
--- a/doxygen/main.doxy
+++ b/doxygen/main.doxy
@@ -43,7 +43,6 @@ 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/doxygen/shader.doxy b/doxygen/shader.doxy
deleted file mode 100644 (file)
index d8ad14c..0000000
--- a/doxygen/shader.doxy
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 \
-                         vbo.tag=vbo
-GENERATE_TAGFILE       = swrast.tag

diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy
index a4f76a295396c06ea967dfb1054e5ceb3a18b070..85ef56ce4b65cdace1c58875d6e85caa845ddffb 100644 (file)
--- a/doxygen/tnl.doxy
+++ b/doxygen/tnl.doxy
@@ -43,7 +43,6 @@ SKIP_FUNCTION_MACROS   = YES
 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

diff --git a/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy
index b241f67f4baae8206dce108bc33cdfc350b8f7dc..5404f379f8257c00a429b5c0ee242da1d2fda49e 100644 (file)
--- a/doxygen/tnl_dd.doxy
+++ b/doxygen/tnl_dd.doxy
@@ -41,7 +41,6 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 TAGFILES               = main.tag=../core \
                          math.tag=../math \
-                        shader.tag=../shader \
                          swrast.tag=../swrast \
                          swrast_setup.tag=../swrast_setup \
                          tnl.tag=../tnl \

diff --git a/doxygen/vbo.doxy b/doxygen/vbo.doxy
index 6dfb21cf4f542b3c3a6b0e68eb952094da52a141..20100688c9e6c1d74298f51b2531fd08301492ef 100644 (file)
--- a/doxygen/vbo.doxy
+++ b/doxygen/vbo.doxy
@@ -42,7 +42,6 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 TAGFILES               = main.tag=../core \
                         math.tag=../math \
-                         shader.tag=../shader \
                         swrast.tag=../swrast \
                         swrast_setup.tag=../swrast_setup \
                         tnl.tag=../tnl \