diff options
| author | Keith Whitwell <[email protected]> | 2010-10-17 19:03:42 -0700 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-10-17 19:09:42 -0700 |
| commit | 0072acd447dc6be652e63752e50215c3105322c8 (patch) | |
| tree | 847d1763b54772d336a04e606f8248291c3092b7 /docs/egl.html | |
| parent | 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff) | |
| parent | ca2b2ac131933b4171b519813df1aaa3a81621cd (diff) | |
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Diffstat (limited to 'docs/egl.html')
| -rw-r--r-- | docs/egl.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/egl.html b/docs/egl.html index 47582672944..d38f2dd7b7d 100644 --- a/docs/egl.html +++ b/docs/egl.html @@ -72,13 +72,13 @@ drivers will be installed to <code>${libdir}/egl</code>.</p> <li><code>--with-egl-platforms</code> <p>List the platforms (window systems) to support. Its argument is a comma -seprated string such as <code>--with-egl-platforms=x11,kms</code>. It decides +seprated string such as <code>--with-egl-platforms=x11,drm</code>. It decides the platforms a driver may support. The first listed platform is also used by the main library to decide the native platform: the platform the EGL native types such as <code>EGLNativeDisplayType</code> or <code>EGLNativeWindowType</code> defined for.</p> -<p>The available platforms are <code>x11</code>, <code>kms</code>, +<p>The available platforms are <code>x11</code>, <code>drm</code>, <code>fbdev</code>, and <code>gdi</code>. The <code>gdi</code> platform can only be built with SCons.</p> |