Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / docs / shading.html

diff --git a/docs/shading.html b/docs/shading.html
index 1a60e5b708dbbd8019b0d946c6b77dd43aa7a68c..2cd17c76ac927fede0709978942559766d26ed6a 100644 (file)
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -28,6 +28,7 @@ Contents
 <li><a href="#standalone">Stand-alone GLSL Compiler</a>
 <li><a href="#implementation">Compiler Implementation</a>
 <li><a href="#validation">Compiler Validation</a>
+<li><a href="#120">GLSL 1.20 support</a>
 </ul>
 
 
@@ -155,8 +156,7 @@ This tool is useful for:
 </ul>
 
 <p>
-After building Mesa the glslcompiler should be found in the Mesa/bin/ directory.
-If it's not there, it can be built manually:
+After building Mesa, the glslcompiler can be built by manually running:
 </p>
 <pre>
     cd src/mesa/drivers/glslcompiler
@@ -319,5 +319,39 @@ should be added.
 </p>
 
 
+
+<a name="120">
+<h2>GLSL 1.20 support</h2>
+
+<p>
+Support for GLSL version 1.20 is underway.  Status as follows.
+</p>
+
+<h3>Supported</h3>
+<ul>
+<li><code>mat2x3, mat2x4</code>, etc. types and functions
+<li><code>transpose(), outerProduct(), matrixCompMult()</code> functions
+(but untested)
+<li>precision qualifiers (lowp, mediump, highp)
+</ul>
+
+<h3>Partially Complete</h3>
+<ul>
+<li><code>invariant</code> qualifier
+</ul>
+
+<h3>Not Completed</h3>
+<ul>
+<li><code>array.length()</code> method
+<li><code>float[5] a;</code> array syntax
+<li><code>centroid</code> qualifier
+<li>unsized array constructors
+<li>initializers for uniforms
+<li>const initializers calling built-in functions
+</ul>
+
+
+
+
 </BODY>
 </HTML>