diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
| commit | bd13c464f728719fceb8a4918b52727ec125ea6e (patch) | |
| tree | 05a48375076036097a9e28356738c05a16cc5ed0 /mesalib/docs/shading.html | |
| parent | bab6395ded69210cbc550c0fb3765160e4405283 (diff) | |
| parent | 0130346adbce7e6b2422429887fc46c76806d845 (diff) | |
| download | vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.gz vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.bz2 vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto mesa pixman git update 4 oct 2012
Diffstat (limited to 'mesalib/docs/shading.html')
| -rw-r--r-- | mesalib/docs/shading.html | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/mesalib/docs/shading.html b/mesalib/docs/shading.html index a12487bb8..19e20b183 100644 --- a/mesalib/docs/shading.html +++ b/mesalib/docs/shading.html @@ -27,7 +27,7 @@ Contents </p> <ul> <li><a href="#envvars">Environment variables</a> -<li><a href="#glsl120">GLSL 1.20 support</a> +<li><a href="#support">GLSL 1.40 support</a> <li><a href="#unsup">Unsupported Features</a> <li><a href="#notes">Implementation Notes</a> <li><a href="#hints">Programming Hints</a> @@ -64,10 +64,10 @@ Example: export MESA_GLSL=dump,nopt </p> -<h2 id="glsl120">GLSL Version</h2> +<h2 id="support">GLSL Version</h2> <p> -The GLSL compiler currently supports version 1.20 of the shading language. +The GLSL compiler currently supports version 1.40 of the shading language. </p> <p> @@ -75,9 +75,8 @@ Several GLSL extensions are also supported: </p> <ul> <li>GL_ARB_draw_buffers -<li>GL_ARB_texture_rectangle <li>GL_ARB_fragment_coord_conventions -<li>GL_EXT_texture_array +<li>GL_ARB_shader_bit_encoding </ul> @@ -94,7 +93,6 @@ in Mesa: <li>Linking of multiple shaders does not always work. Currently, linking is implemented through shader concatenation and re-compiling. This doesn't always work because of some #pragma and preprocessor issues. -<li>gl_ClipVertex <li>The gl_Color and gl_SecondaryColor varying vars are interpolated without perspective correction </ul> @@ -251,8 +249,7 @@ regressions. <p> The <a href="http://piglit.freedesktop.org/">Piglit</a> project -has many GLSL tests and the -<a href="http://glean.sf.net">Glean</a> glsl1 test tests GLSL features. +has many GLSL tests. </p> <p> |