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/opengles.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/opengles.html')
| -rw-r--r-- | mesalib/docs/opengles.html | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mesalib/docs/opengles.html b/mesalib/docs/opengles.html index d02482589..f08acb57b 100644 --- a/mesalib/docs/opengles.html +++ b/mesalib/docs/opengles.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>OpenGL ES</h1> <p>Mesa implements OpenGL ES 1.1 and OpenGL ES 2.0. More informations about -OpenGL ES can be found at <a href="http://www.khronos.org/opengles/" -target="_parent"> http://www.khronos.org/opengles/</a>.</p> +OpenGL ES can be found at <a href="http://www.khronos.org/opengles/"> +http://www.khronos.org/opengles/</a>.</p> <p>OpenGL ES depends on a working EGL implementation. Please refer to <a href="egl.html">Mesa EGL</a> for more information about EGL.</p> @@ -58,5 +65,6 @@ EGL drivers for your hardware.</p> <p>Other than the last case, OpenGL ES uses <code>APIspec.xml</code> to generate functions to check and/or converts the arguments.</p> +</div> </body> </html> |