diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-20 08:33:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-20 08:33:45 +0200 |
| commit | 210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (patch) | |
| tree | 906904bdff9c33a3f9ded24ba8c89488469c5d94 /mesalib/docs/shading.html | |
| parent | 821b51e814fe14d35f3807c525e4387022b9ed80 (diff) | |
| parent | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (diff) | |
| download | vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.tar.gz vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.tar.bz2 vcxsrv-210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xserver pixman mesa git update 20 sep 2012
Conflicts:
libxcb/src/xcb_conn.c
Diffstat (limited to 'mesalib/docs/shading.html')
| -rw-r--r-- | mesalib/docs/shading.html | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/mesalib/docs/shading.html b/mesalib/docs/shading.html index 17cf35c22..a12487bb8 100644 --- a/mesalib/docs/shading.html +++ b/mesalib/docs/shading.html @@ -7,11 +7,18 @@ </head> <body> +<div class="header"> + <h1>The Mesa 3D Graphics Library</h1> +</div> + +<iframe src="contents.html"></iframe> +<div class="content"> + <h1>Shading Language Support</h1> <p> This page describes the features and status of Mesa's support for the -<a href="http://opengl.org/documentation/glsl/" target="_parent"> +<a href="http://opengl.org/documentation/glsl/"> OpenGL Shading Language</a>. </p> @@ -243,15 +250,15 @@ regressions. </p> <p> -The <a href="http://piglit.freedesktop.org/" target="_parent">Piglit</a> project +The <a href="http://piglit.freedesktop.org/">Piglit</a> project has many GLSL tests and the -<a href="http://glean.sf.net" target="_parent">Glean</a> glsl1 test -tests GLSL features. +<a href="http://glean.sf.net">Glean</a> glsl1 test tests GLSL features. </p> <p> The Mesa demos repository also has some good GLSL tests. </p> +</div> </body> </html> |