From cf3bc91c063e71f7458d2e5645a8da87d2b0eaf4 Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Sat, 9 Apr 2016 16:43:18 -0400 Subject: [PATCH] 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 Acked-by: Emil Velikov --- 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 a5f3921b445..1c186cb7285 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 01c2691cfe0..b1bc15d5a05 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 331b931928e..e566ca3f7b8 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 abd736fbff5..034231cbdfd 100644 --- a/doxygen/header.html +++ b/doxygen/header.html @@ -10,7 +10,6 @@ glsl | vbo | math | -shader | swrast | swrast_setup | tnl | diff --git a/doxygen/main.doxy b/doxygen/main.doxy index c2580319e38..0edcefa3894 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 d8ad14cc76c..00000000000 --- 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 a4f76a29539..85ef56ce4b6 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 b241f67f4ba..5404f379f82 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 6dfb21cf4f5..20100688c9e 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.30.2