Merge branch 'gallium-userbuf'

[mesa.git] / src / gallium / docs / source / glossary.rst

diff --git a/src/gallium/docs/source/glossary.rst b/src/gallium/docs/source/glossary.rst
index aec89f8b5c48a62588c91583668819aa1f8f4dcf..c749d0c95561b8c61d7ebbdfc69467752eff0911 100644 (file)
--- a/src/gallium/docs/source/glossary.rst
+++ b/src/gallium/docs/source/glossary.rst
@@ -13,3 +13,23 @@ Glossary
       Transform, Clipping, & Lighting. The three stages of preparation in a
       rasterizing pipeline prior to the actual rasterization of vertices into
       fragments.
+
+   NPOT
+      Non-power-of-two. Usually applied to textures which have at least one
+      dimension which is not a power of two.
+
+   LOD
+      Level of Detail. Also spelled "LoD." The value that determines when the
+      switches between mipmaps occur during texture sampling.
+
+   layer
+      This term is used as the name of the "3rd coordinate" of a resource.
+      3D textures have zslices, cube maps have faces, 1D and 2D array textures
+      have array members (other resources do not have multiple layers).
+      Since the functions only take one parameter no matter what type of
+      resource is used, use the term "layer" instead of a resource type
+      specific one.
+
+   GLSL
+      GL Shading Language. The official, common high-level shader language used
+      in GL 2.0 and above.