summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2010-06-16 18:57:51 -0700
committerCorbin Simpson <[email protected]>2010-06-16 18:58:18 -0700
commit1e6d51e805baa11eff17ea784c92ffc7933c56c5 (patch)
treeab46912aa6e715c037a0a840d7575a770951c00f /src/gallium
parentf98c462770ad26888c4c89f7e0989c2dba48e77d (diff)
gallium/docs: GLSL glossary entry.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/docs/source/glossary.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/docs/source/glossary.rst b/src/gallium/docs/source/glossary.rst
index 0696cb5d277..acde56eafc4 100644
--- a/src/gallium/docs/source/glossary.rst
+++ b/src/gallium/docs/source/glossary.rst
@@ -21,3 +21,7 @@ Glossary
LOD
Level of Detail. Also spelled "LoD." The value that determines when the
switches between mipmaps occur during texture sampling.
+
+ GLSL
+ GL Shading Language. The official, common high-level shader language used
+ in GL 2.0 and above.