2 files changed, 82 insertions, 94 deletions
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html
index fe3fe4b77..9eb7b44cc 100644
--- a/mesalib/docs/egl.html
+++ b/mesalib/docs/egl.html
@@ -88,17 +88,6 @@ internal library that supports multiple APIs.</p>
 
 </li>
 
-<li><code>--enable-gles-overlay</code>
-
-<p>This option enables OpenGL ES as separate internal libraries.  This is an
-alternative approach to enable OpenGL ES.</p>
-
-<p>This is only supported by <code>egl_gallium</code>.  For systems using DRI
-drivers, <code>--enable-gles1</code> and <code>--enable-gles2</code> are
-suggested instead as all drivers will benefit.</p>
-
-</li>
-
 <li><code>--enable-openvg</code>
 
 <p>OpenVG must be explicitly enabled by this option.</p>
@@ -148,9 +137,10 @@ may set</p>
 
 <li><code>EGL_DRIVER</code>
 
-<p>This variable specifies a full path to an EGL driver and it forces the
-specified EGL driver to be loaded.  It comes in handy when one wants to test a
-specific driver.  This variable is ignored for setuid/setgid binaries.</p>
+<p>This variable specifies a full path to or the name of an EGL driver.  It
+forces the specified EGL driver to be loaded.  It comes in handy when one wants
+to test a specific driver.  This variable is ignored for setuid/setgid
+binaries.</p>
 
 </li>
 
diff --git a/mesalib/docs/opengles.html b/mesalib/docs/opengles.html
index 63cc1146a..28b0acc20 100644
--- a/mesalib/docs/opengles.html
+++ b/mesalib/docs/opengles.html
@@ -1,80 +1,78 @@
-<html>
-
-<title>OpenGL ES</title>
-
-<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
-
-<body>
-
-<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>
-
-<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>
-
-<h2>Build the Libraries</h2>
-<ol>
-<li>Run <code>configure</code> with <code>--enable-gles-overlay</code> and enable the Gallium driver for your hardware.</li>
-<li>Build and install Mesa as usual.</li>
-</ol>
-
-Alternatively, if XCB-DRI2 is installed on the system, one can use
-<code>egl_dri2</code> EGL driver with OpenGL|ES-enabled DRI drivers
-
-<ol>
-<li>Run <code>configure</code> with <code>--enable-gles1 --enable-gles2</code>.</li>
-<li>Build and install Mesa as usual.</li>
-</ol>
-
-<p>Both methods will install libGLESv1_CM, libGLESv2, libEGL, and one or more
-EGL drivers for your hardware.</p>
-
-<h2>Run the Demos</h2>
-
-<p>There are some demos in <code>progs/egl/</code>.  You can use them to test
-your build.  For example,</p>
-
-<pre>
-  $ cd progs/egl/eglut
-  $ make
-  $ cd ../opengles1
-  $ make
-  $ ./torus_x11
-</pre>
-
-<h2>Developers</h2>
-
-<h3>Internal Libraries</h3>
-
-<table border="1" style="text-align: center;">
-	<tr><td>Library Name</td><td>Used By</td><td>Enabled</td><td>OpenGL</td><td>OpenGL ES 1.x</td><td>OpenGL ES 2.x</td></tr>
-	<tr><td><code>libmesa.a</td><td>Classic DRI drivers</td><td>y</td><td>y</td><td>--enable-gles1</td><td>--enable-gles2</td></tr>
-	<tr><td><code>libmesagallium.a</td><td>Gallium EGL and DRI drivers</td><td>y</td><td>y</td><td>--enable-gles1</td><td>--enable-gles2</td></tr>
-	<tr><td><code>libes1gallium.a</td><td>Gallium EGL drivers</td><td>--enable-gles-overlay</td><td>n</td><td>y</td><td>n</td></tr>
-	<tr><td><code>libes2gallium.a</td><td>Gallium EGL drivers</td><td>--enable-gles-overlay</td><td>n</td><td>n</td><td>y</td></tr>
-</table>
-
-<h3>Dispatch Table</h3>
-
-<p>OpenGL ES has an additional indirection when dispatching fucntions</p>
-
-<pre>
-  Mesa:       glFoo() --&gt; _mesa_Foo()
-  OpenGL ES:  glFoo() --&gt; _es_Foo() --&gt; _mesa_Foo()
-</pre>
-
-<p>The indirection serves several purposes</p>
-
-<ul>
-<li>When a function is in Mesa and the type matches, it checks the arguments and calls the Mesa function.</li>
-<li>When a function is in Mesa but the type mismatches, it checks and converts the arguments before calling the Mesa function.</li>
-<li>When a function is not available in Mesa, or accepts arguments that are not available in OpenGL, it provides its own implementation.</li>
-</ul>
-
-<p>Other than the last case, OpenGL ES uses <code>APIspec.xml</code> to generate functions to check and/or converts the arguments.</p>
-
-</body>
-</html>
+<html>
+
+<title>OpenGL ES</title>
+
+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<body>
+
+<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>
+
+<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>
+
+<h2>Build the Libraries</h2>
+<ol>
+<li>Run <code>configure</code> with <code>--enable-gles1 --enable-gles2</code> and enable the Gallium driver for your hardware.</li>
+<li>Build and install Mesa as usual.</li>
+</ol>
+
+Alternatively, if XCB-DRI2 is installed on the system, one can use
+<code>egl_dri2</code> EGL driver with OpenGL|ES-enabled DRI drivers
+
+<ol>
+<li>Run <code>configure</code> with <code>--enable-gles1 --enable-gles2</code>.</li>
+<li>Build and install Mesa as usual.</li>
+</ol>
+
+<p>Both methods will install libGLESv1_CM, libGLESv2, libEGL, and one or more
+EGL drivers for your hardware.</p>
+
+<h2>Run the Demos</h2>
+
+<p>There are some demos in <code>progs/egl/</code>.  You can use them to test
+your build.  For example,</p>
+
+<pre>
+  $ cd progs/egl/eglut
+  $ make
+  $ cd ../opengles1
+  $ make
+  $ ./torus_x11
+</pre>
+
+<h2>Developers</h2>
+
+<h3>Internal Libraries</h3>
+
+<table border="1" style="text-align: center;">
+	<tr><td>Library Name</td><td>Used By</td><td>Enabled</td><td>OpenGL</td><td>OpenGL ES 1.x</td><td>OpenGL ES 2.x</td></tr>
+	<tr><td><code>libmesa.a</td><td>Classic DRI drivers</td><td>y</td><td>y</td><td>--enable-gles1</td><td>--enable-gles2</td></tr>
+	<tr><td><code>libmesagallium.a</td><td>Gallium EGL and DRI drivers</td><td>y</td><td>y</td><td>--enable-gles1</td><td>--enable-gles2</td></tr>
+</table>
+
+<h3>Dispatch Table</h3>
+
+<p>OpenGL ES has an additional indirection when dispatching fucntions</p>
+
+<pre>
+  Mesa:       glFoo() --&gt; _mesa_Foo()
+  OpenGL ES:  glFoo() --&gt; _es_Foo() --&gt; _mesa_Foo()
+</pre>
+
+<p>The indirection serves several purposes</p>
+
+<ul>
+<li>When a function is in Mesa and the type matches, it checks the arguments and calls the Mesa function.</li>
+<li>When a function is in Mesa but the type mismatches, it checks and converts the arguments before calling the Mesa function.</li>
+<li>When a function is not available in Mesa, or accepts arguments that are not available in OpenGL, it provides its own implementation.</li>
+</ul>
+
+<p>Other than the last case, OpenGL ES uses <code>APIspec.xml</code> to generate functions to check and/or converts the arguments.</p>
+
+</body>
+</html>