diff options
| -rw-r--r-- | docs/egl.html | 45 | ||||
| -rw-r--r-- | docs/opengles.html | 19 | ||||
| -rw-r--r-- | docs/openvg.html | 10 |
3 files changed, 27 insertions, 47 deletions
diff --git a/docs/egl.html b/docs/egl.html index fb15086679f..5b750070ca1 100644 --- a/docs/egl.html +++ b/docs/egl.html @@ -29,12 +29,14 @@ directly dispatched to the drivers.</p> the driver for your hardware. For example</p> <pre> - $ ./configure --enable-gles2 --enable-openvg --enable-gallium-nouveau + $ ./configure --enable-gles1 --enable-gles2 \ + --with-dri-drivers=... \ + --with-gallium-drivers=... </pre> -<p>The main library and OpenGL is enabled by default. The first option above -enables <a href="opengles.html">OpenGL ES 2.x</a>. The second option enables -<a href="openvg.html">OpenVG</a>.</p> +<p>The main library and OpenGL is enabled by default. The first two options +above enables <a href="opengles.html">OpenGL ES 1.x and 2.x</a>. The last two +options enables the listed classic and and Gallium drivers respectively.</p> </li> @@ -42,8 +44,8 @@ enables <a href="opengles.html">OpenGL ES 2.x</a>. The second option enables </ol> <p>In the given example, it will build and install <code>libEGL</code>, -<code>libGL</code>, <code>libGLESv1_CM</code>, <code>libGLESv2</code>, -<code>libOpenVG</code>, and one or more EGL drivers.</p> +<code>libGL</code>, <code>libGLESv1_CM</code>, <code>libGLESv2</code>, and one +or more EGL drivers.</p> <h3>Configure Options</h3> @@ -65,6 +67,12 @@ drivers will be installed to <code>${libdir}/egl</code>.</p> </li> +<li><code>--enable-gallium-egl</code> + +<p>Enable the optional <code>egl_gallium</code> driver.</p> + +</li> + <li><code>--with-egl-platforms</code> <p>List the platforms (window systems) to support. Its argument is a comma @@ -88,15 +96,17 @@ internal library that supports multiple APIs.</p> </li> -<li><code>--enable-openvg</code> +<li><code>--enable-shared-glapi</code> -<p>OpenVG must be explicitly enabled by this option.</p> +<p>By default, <code>libGL</code> has its own copy of <code>libglapi</code>. +This options makes <code>libGL</code> use the shared <code>libglapi</code>. This +is required if applications mix OpenGL and OpenGL ES.</p> </li> -<li><code>--enable-gallium-egl</code> +<li><code>--enable-openvg</code> -<p>Explicitly enable or disable <code>egl_gallium</code>.</p> +<p>OpenVG must be explicitly enabled by this option.</p> </li> @@ -220,8 +230,7 @@ distribution.</p> <p>Generally, <code>egl_dri2</code> is preferred over <code>egl_gallium</code> when the system already has DRI drivers. As <code>egl_gallium</code> is loaded before <code>egl_dri2</code> when both are available, <code>egl_gallium</code> -may either be disabled with <code>--disable-gallium-egl</code> or packaged -separately.</p> +is disabled by default.</p> <h2>Developers</h2> @@ -307,17 +316,5 @@ 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. -<h3>TODOs</h3> - -<ul> -<li>Pass the conformance tests</li> -<li>Mixed use of OpenGL, OpenGL ES 1.1, and OpenGL ES 2.0 is supported. But -which one of <code>libGL.so</code>, <code>libGLESv1_CM.so</code>, and -<code>libGLESv2.so</code> should an application link to? Bad things may happen -when, say, an application is linked to <code>libGLESv2.so</code> and -<code>libcairo</code>, which is linked to <code>libGL.so</code> instead.</li> - -</ul> - </body> </html> diff --git a/docs/opengles.html b/docs/opengles.html index 742182e76a3..0fee488e1a1 100644 --- a/docs/opengles.html +++ b/docs/opengles.html @@ -34,27 +34,10 @@ 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> +<p>There are some demos in <code>mesa/demos</code> repository.</p> <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> diff --git a/docs/openvg.html b/docs/openvg.html index eff8c5828e2..81e50b65f36 100644 --- a/docs/openvg.html +++ b/docs/openvg.html @@ -11,7 +11,7 @@ <H1>OpenVG State Tracker</H1> <p> -The current version of the OpenVG state tracker implements OpenVG 1.0. +The current version of the OpenVG state tracker implements OpenVG 1.1. </p> <p> More informations about OpenVG can be found at @@ -26,9 +26,9 @@ Please refer to <a href="egl.html">Mesa EGL</a> for more information about EGL. <h2>Building the library</h2> <ol> -<li>Run <code>configure</code> with <code>--enable-openvg</code>. If you do -not need OpenGL, you can add <code>--disable-opengl</code> to save the -compilation time.</li> +<li>Run <code>configure</code> with <code>--enable-openvg</code> and +<code>--enable-gallium-egl</code>. If you do not need OpenGL, you can add +<code>--disable-opengl</code> to save the compilation time.</li> <li>Build and install Mesa as usual.</li> </ol> @@ -36,7 +36,7 @@ compilation time.</li> <h3>Sample build</h3> A sample build looks as follows: <pre> - $ ./configure --disable-opengl --enable-openvg + $ ./configure --disable-opengl --enable-openvg --enable-gallium-egl $ make $ make install </pre> |