diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-05-12 14:17:17 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-05-12 15:03:42 +0800 |
| commit | 87cc2da16ef2c32813eee9c9c8af3c919f4739d9 (patch) | |
| tree | 8fae12c282f657ff2558b8a16a2a861b414de6e2 /docs | |
| parent | 8d5c83c467f83b44f5f2e271c4f9cca2d45af518 (diff) | |
mesa/es: Merge back to core mesa.
With the omit list gone, there are not too many differences in building
core mesa and ES overlay. Remove the mesa/es and build both of them in
src/mesa/Makefile.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/opengles.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/opengles.html b/docs/opengles.html index 9984a79b1b2..63cc1146a2e 100644 --- a/docs/opengles.html +++ b/docs/opengles.html @@ -51,10 +51,10 @@ your build. For example,</p> <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>src/mesa/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>src/mesa/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>src/mesa/es/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>src/mesa/es/libes2gallium.a</td><td>Gallium EGL drivers</td><td>--enable-gles-overlay</td><td>n</td><td>n</td><td>y</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> |