summaryrefslogtreecommitdiffstats
path: root/src/gallium/docs/source
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2009-12-20 20:37:40 -0800
committerCorbin Simpson <[email protected]>2009-12-21 18:01:24 -0800
commit9ddeab48c85d45b7b7cc781dcf566e0767c84ba5 (patch)
tree7fdee8f0ba3539e2400526d11ebb676b2867972d /src/gallium/docs/source
parentf3347fe397cb917dbfc18f87795a5187f2763019 (diff)
More docs. Glossary.
Diffstat (limited to 'src/gallium/docs/source')
-rw-r--r--src/gallium/docs/source/conf.py3
-rw-r--r--src/gallium/docs/source/cso/rasterizer.rst17
-rw-r--r--src/gallium/docs/source/glossary.rst10
-rw-r--r--src/gallium/docs/source/index.rst1
4 files changed, 23 insertions, 8 deletions
diff --git a/src/gallium/docs/source/conf.py b/src/gallium/docs/source/conf.py
index 7ff4896a91a..2b974b727cd 100644
--- a/src/gallium/docs/source/conf.py
+++ b/src/gallium/docs/source/conf.py
@@ -83,6 +83,9 @@ exclude_trees = []
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
+# The language for highlighting source code.
+highlight_language = 'c'
+
# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
diff --git a/src/gallium/docs/source/cso/rasterizer.rst b/src/gallium/docs/source/cso/rasterizer.rst
index 0686bffa1e0..afb58ea375f 100644
--- a/src/gallium/docs/source/cso/rasterizer.rst
+++ b/src/gallium/docs/source/cso/rasterizer.rst
@@ -29,7 +29,7 @@ point_sprite
point_size_per_vertex
Whether vertices have a point size element.
multisample
- Whether MSAA is enabled.
+ Whether :ref:`MSAA` is enabled.
line_smooth
Whether lines should be smoothed. Line smoothing is simply anti-aliasing.
line_stipple_enable
@@ -77,10 +77,11 @@ flatshade_first
There are several important exceptions to the specification of this rule.
-* PIPE_PRIMITIVE_POLYGON: The provoking vertex is always the first vertex.
- If the caller wishes to change the provoking vertex, they merely need to
- rotate the vertices themselves.
-* PIPE_PRIMITIVE_QUAD, PIPE_PRIMITIVE_QUAD_STRIP: This option has no effect.
-* PIPE_PRIMITIVE_TRIANGLE_FAN: When set, the provoking vertex is the second
- vertex, not the first. This permits each segment of the fan to have a
- different color.
+* ``PIPE_PRIMITIVE_POLYGON``: The provoking vertex is always the first
+ vertex. If the caller wishes to change the provoking vertex, they merely
+ need to rotate the vertices themselves.
+* ``PIPE_PRIMITIVE_QUAD``, ``PIPE_PRIMITIVE_QUAD_STRIP``: This option has no
+ effect; the provoking vertex is always the last vertex.
+* ``PIPE_PRIMITIVE_TRIANGLE_FAN``: When set, the provoking vertex is the
+ second vertex, not the first. This permits each segment of the fan to have
+ a different color.
diff --git a/src/gallium/docs/source/glossary.rst b/src/gallium/docs/source/glossary.rst
new file mode 100644
index 00000000000..6a9110ce786
--- /dev/null
+++ b/src/gallium/docs/source/glossary.rst
@@ -0,0 +1,10 @@
+Glossary
+========
+
+.. glossary::
+ :sorted:
+
+ MSAA
+ Multi-Sampled Anti-Aliasing. A basic anti-aliasing technique that takes
+ multiple samples of the depth buffer, and uses this information to
+ smooth the edges of polygons.
diff --git a/src/gallium/docs/source/index.rst b/src/gallium/docs/source/index.rst
index e1b04e64538..1800bbed47b 100644
--- a/src/gallium/docs/source/index.rst
+++ b/src/gallium/docs/source/index.rst
@@ -16,6 +16,7 @@ Contents:
screen
context
cso
+ glossary
Indices and tables
==================