diff options
Diffstat (limited to 'doxygen')
| -rw-r--r-- | doxygen/.gitignore | 8 | ||||
| -rw-r--r-- | doxygen/Makefile | 4 | ||||
| -rw-r--r-- | doxygen/Makefile.orig | 35 | ||||
| -rw-r--r-- | doxygen/common.doxy | 51 | ||||
| -rw-r--r-- | doxygen/core_subset.doxy | 3 | ||||
| -rw-r--r-- | doxygen/doxy.bat | 2 | ||||
| -rw-r--r-- | doxygen/gbm.doxy | 6 | ||||
| -rw-r--r-- | doxygen/glapi.doxy | 8 | ||||
| -rw-r--r-- | doxygen/glsl.doxy | 9 | ||||
| -rw-r--r-- | doxygen/header.html | 2 | ||||
| -rw-r--r-- | doxygen/header.html.orig | 19 | ||||
| -rw-r--r-- | doxygen/header_subset.html | 1 | ||||
| -rw-r--r-- | doxygen/i965.doxy | 2 | ||||
| -rw-r--r-- | doxygen/main.doxy | 1 | ||||
| -rw-r--r-- | doxygen/math.doxy | 2 | ||||
| -rw-r--r-- | doxygen/nir.doxy (renamed from doxygen/shader.doxy) | 43 | ||||
| -rw-r--r-- | doxygen/radeon_subset.doxy | 3 | ||||
| -rw-r--r-- | doxygen/swrast.doxy | 4 | ||||
| -rw-r--r-- | doxygen/swrast_setup.doxy | 2 | ||||
| -rw-r--r-- | doxygen/tnl.doxy | 9 | ||||
| -rw-r--r-- | doxygen/tnl_dd.doxy | 5 | ||||
| -rw-r--r-- | doxygen/vbo.doxy | 3 |
22 files changed, 106 insertions, 116 deletions
diff --git a/doxygen/.gitignore b/doxygen/.gitignore index a5f3921b445..47734136b0a 100644 --- a/doxygen/.gitignore +++ b/doxygen/.gitignore @@ -1,9 +1,6 @@ *.db *.tag *.tmp -agpgart -array_cache -core core_subset gallium gbm @@ -13,11 +10,8 @@ i965 main math math_subset -miniglx -radeondrm -radeonfb +nir radeon_subset -shader swrast swrast_setup tnl diff --git a/doxygen/Makefile b/doxygen/Makefile index 01c2691cfe0..6685b998f00 100644 --- a/doxygen/Makefile +++ b/doxygen/Makefile @@ -12,13 +12,13 @@ FULL = \ vbo.doxy \ glapi.doxy \ glsl.doxy \ - shader.doxy \ swrast.doxy \ swrast_setup.doxy \ tnl.doxy \ tnl_dd.doxy \ gbm.doxy \ - i965.doxy + i965.doxy \ + nir.doxy full: $(FULL:.doxy=.tag) $(foreach FILE,$(FULL),doxygen $(FILE);) diff --git a/doxygen/Makefile.orig b/doxygen/Makefile.orig new file mode 100644 index 00000000000..b1bc15d5a05 --- /dev/null +++ b/doxygen/Makefile.orig @@ -0,0 +1,35 @@ + +default: full + +all: full subset + +%.tag: %.doxy + doxygen $< + +FULL = \ + main.doxy \ + math.doxy \ + vbo.doxy \ + glapi.doxy \ + glsl.doxy \ + swrast.doxy \ + swrast_setup.doxy \ + tnl.doxy \ + tnl_dd.doxy \ + gbm.doxy \ + i965.doxy + +full: $(FULL:.doxy=.tag) + $(foreach FILE,$(FULL),doxygen $(FILE);) + +SUBSET = \ + main.doxy \ + math.doxy + +subset: $(SUBSET:.doxy=.tag) + $(foreach FILE,$(SUBSET),doxygen $(FILE);) + +clean: + -rm -rf $(FULL:.doxy=) $(SUBSET:.doxy=) + -rm -rf *.tag + -rm -rf *.db diff --git a/doxygen/common.doxy b/doxygen/common.doxy index 48f0c95d6d6..eec59c41ac9 100644 --- a/doxygen/common.doxy +++ b/doxygen/common.doxy @@ -53,16 +53,6 @@ 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). @@ -147,13 +137,6 @@ 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. @@ -607,12 +590,6 @@ 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) @@ -839,18 +816,6 @@ 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 @@ -1104,22 +1069,6 @@ 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/doxygen/core_subset.doxy b/doxygen/core_subset.doxy index dfa59f4dd61..4123485933c 100644 --- a/doxygen/core_subset.doxy +++ b/doxygen/core_subset.doxy @@ -190,8 +190,7 @@ SKIP_FUNCTION_MACROS = YES # Configuration::addtions related to external references #--------------------------------------------------------------------------- TAGFILES = \ - math_subset.tag=../math_subset \ - miniglx.tag=../miniglx + math_subset.tag=../math_subset GENERATE_TAGFILE = core_subset.tag ALLEXTERNALS = NO PERL_PATH = 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/gbm.doxy b/doxygen/gbm.doxy index 37e4aa05f95..537d682998d 100644 --- a/doxygen/gbm.doxy +++ b/doxygen/gbm.doxy @@ -39,10 +39,10 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = main.tag=../core \ +TAGFILES = main.tag=../main \ math.tag=../math \ tnl_dd.tag=../tnl_dd \ - swrast_setup.tag=../gbm_setup \ + swrast_setup.tag=../swrast_setup \ tnl.tag=../tnl \ - vbo.tag=vbo + vbo.tag=../vbo GENERATE_TAGFILE = gbm.tag diff --git a/doxygen/glapi.doxy b/doxygen/glapi.doxy index 3290f8455a1..10046b9c34b 100644 --- a/doxygen/glapi.doxy +++ b/doxygen/glapi.doxy @@ -9,7 +9,7 @@ PROJECT_NAME = "Mesa GL API dispatcher" #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/mesa/glapi/ +INPUT = ../src/mapi/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=../core \ +TAGFILES = main.tag=../main \ 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 + vbo.tag=../vbo +GENERATE_TAGFILE = glapi.tag diff --git a/doxygen/glsl.doxy b/doxygen/glsl.doxy index 9915ba28e37..ef71a4a0202 100644 --- a/doxygen/glsl.doxy +++ b/doxygen/glsl.doxy @@ -9,11 +9,12 @@ PROJECT_NAME = "Mesa GLSL module" #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/glsl/ +INPUT = ../src/compiler/glsl/ +FILE_PATTERNS = *.c *.cpp *.h RECURSIVE = NO -EXCLUDE = ../src/glsl/glsl_lexer.cpp \ - ../src/glsl/glsl_parser.cpp \ - ../src/glsl/glsl_parser.h +EXCLUDE = ../src/compiler/glsl/glsl_lexer.cpp \ + ../src/compiler/glsl/glsl_parser.cpp \ + ../src/compiler/glsl/glsl_parser.h EXCLUDE_PATTERNS = #--------------------------------------------------------------------------- # configuration options related to the HTML output diff --git a/doxygen/header.html b/doxygen/header.html index abd736fbff5..9f12b58bc80 100644 --- a/doxygen/header.html +++ b/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/doxygen/header.html.orig b/doxygen/header.html.orig new file mode 100644 index 00000000000..034231cbdfd --- /dev/null +++ b/doxygen/header.html.orig @@ -0,0 +1,19 @@ +<html> +<head> +<title>Mesa Source Code Documentation</title> +<link href="doxygen.css" rel="stylesheet" type="text/css"> +</head> +<body> +<div class="qindex"> +<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="../vbo/index.html">vbo</a> | +<a class="qindex" href="../math/index.html">math</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> | +<a class="qindex" href="../tnl_dd/index.html">tnl_dd</a> | +<a class="qindex" href="../gbm/index.html">gbm</a> | +<a class="qindex" href="../i965/index.html">i965</a> +</div> diff --git a/doxygen/header_subset.html b/doxygen/header_subset.html index f9a698db842..4dacc153d5f 100644 --- a/doxygen/header_subset.html +++ b/doxygen/header_subset.html @@ -6,6 +6,5 @@ <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/doxygen/i965.doxy b/doxygen/i965.doxy index a3aa2b607fe..014245e581b 100644 --- a/doxygen/i965.doxy +++ b/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/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/math.doxy b/doxygen/math.doxy index 388af40fe5b..b2601124411 100644 --- a/doxygen/math.doxy +++ b/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=../core \ + main.tag=../main \ swrast.tag=../swrast \ swrast_setup.tag=../swrast_setup \ tnl.tag=../tnl \ diff --git a/doxygen/shader.doxy b/doxygen/nir.doxy index d8ad14cc76c..cad7380a594 100644 --- a/doxygen/shader.doxy +++ b/doxygen/nir.doxy @@ -5,45 +5,46 @@ #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "Mesa Vertex and Fragment Program code" +PROJECT_NAME = "Mesa NIR module" #--------------------------------------------------------------------------- -# configuration options related to the input files +# Configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/mesa/shader/ -FILE_PATTERNS = *.c *.h +INPUT = ../src/compiler/nir +FILE_PATTERNS = *.c *.cpp *.h RECURSIVE = NO -EXCLUDE = -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = +EXCLUDE = +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = +IMAGE_PATH = +INPUT_FILTER = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- -# configuration options related to the HTML output +# Configuration options related to the HTML output #--------------------------------------------------------------------------- -HTML_OUTPUT = shader +HTML_OUTPUT = nir #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# 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 = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::addtions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -TAGFILES = main.tag=../core \ +TAGFILES = glsl.tag=../glsl \ + main.tag=../main \ 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 + tnl_dd.tag=../tnl_dd \ + vbo.tag=../vbo +GENERATE_TAGFILE = nir.tag diff --git a/doxygen/radeon_subset.doxy b/doxygen/radeon_subset.doxy index fb9d0e9535a..ad4399cebe3 100644 --- a/doxygen/radeon_subset.doxy +++ b/doxygen/radeon_subset.doxy @@ -168,8 +168,7 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- TAGFILES = \ core_subset.tag=../core_subset \ - math_subset.tag=../math_subset \ - miniglx.tag=../miniglx + math_subset.tag=../math_subset GENERATE_TAGFILE = radeon_subset.tag ALLEXTERNALS = NO PERL_PATH = diff --git a/doxygen/swrast.doxy b/doxygen/swrast.doxy index fa07afd594f..cbab13064b3 100644 --- a/doxygen/swrast.doxy +++ b/doxygen/swrast.doxy @@ -39,10 +39,10 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = main.tag=../core \ +TAGFILES = main.tag=../main \ 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/doxygen/swrast_setup.doxy b/doxygen/swrast_setup.doxy index ee6f3ffdc8f..31414764174 100644 --- a/doxygen/swrast_setup.doxy +++ b/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=../core \ + main.tag=../main \ math.tag=../math \ swrast.tag=../swrast \ tnl.tag=../tnl \ diff --git a/doxygen/tnl.doxy b/doxygen/tnl.doxy index a4f76a29539..e6d6572009f 100644 --- a/doxygen/tnl.doxy +++ b/doxygen/tnl.doxy @@ -40,11 +40,10 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = tnl_dd.tag=../tnl \ - main.tag=../core \ +TAGFILES = tnl_dd.tag=../tnl_dd \ + main.tag=../main \ 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/doxygen/tnl_dd.doxy b/doxygen/tnl_dd.doxy index b241f67f4ba..172e46f2db5 100644 --- a/doxygen/tnl_dd.doxy +++ b/doxygen/tnl_dd.doxy @@ -39,11 +39,10 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = main.tag=../core \ +TAGFILES = main.tag=../main \ 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/doxygen/vbo.doxy b/doxygen/vbo.doxy index 6dfb21cf4f5..db00b3526fa 100644 --- a/doxygen/vbo.doxy +++ b/doxygen/vbo.doxy @@ -40,9 +40,8 @@ SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = main.tag=../core \ +TAGFILES = main.tag=../main \ math.tag=../math \ - shader.tag=../shader \ swrast.tag=../swrast \ swrast_setup.tag=../swrast_setup \ tnl.tag=../tnl \ |