[Mesa-dev] [PATCH 1/9] doxygen: Remove src/mesa/shader/ references
Rhys Kidd
rhyskidd at gmail.com
Sat Apr 9 20:43:18 UTC 2016
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 at gmail.com>
---
doxygen/.gitignore | 1 -
doxygen/Makefile | 1 -
doxygen/doxy.bat | 2 --
doxygen/header.html | 1 -
doxygen/main.doxy | 1 -
doxygen/shader.doxy | 49 -------------------------------------------------
doxygen/tnl.doxy | 1 -
doxygen/tnl_dd.doxy | 1 -
doxygen/vbo.doxy | 1 -
9 files changed, 58 deletions(-)
delete mode 100644 doxygen/shader.doxy
diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index a5f3921..1c186cb 100644
--- 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 01c2691..b1bc15d 100644
--- 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 331b931..e566ca3 100644
--- 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 abd736f..034231c 100644
--- 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 c258031..0edcefa 100644
--- 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
index d8ad14c..0000000
--- a/doxygen/shader.doxy
+++ /dev/null
@@ -1,49 +0,0 @@
-# Doxyfile 0.1
-
- at 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 a4f76a2..85ef56c 100644
--- 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 b241f67..5404f37 100644
--- 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 6dfb21c..2010068 100644
--- 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 \
--
2.5.0
More information about the mesa-dev
mailing list