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/egl.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/egl.html')
| -rw-r--r-- | mesalib/docs/egl.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html index e374357c9..a77c12fe2 100644 --- a/mesalib/docs/egl.html +++ b/mesalib/docs/egl.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>Mesa EGL</h1> <p>The current version of EGL in Mesa implements EGL 1.4. More information about EGL can be found at -<a href="http://www.khronos.org/egl/" target="_parent"> +<a href="http://www.khronos.org/egl/"> http://www.khronos.org/egl/</a>.</p> <p>The Mesa's implementation of EGL uses a driver architecture. The main @@ -317,5 +324,6 @@ not be called with the sample display at the same time. If a driver has access to an <code>EGLDisplay</code> without going through the EGL APIs, the driver should as well lock the display before using it. +</div> </body> </html> |