diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
| commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
| tree | 193651a94adb3804e800747e993d07b92688e4d4 /mesalib/docs/egl.html | |
| parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
| parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
| download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/docs/egl.html')
| -rw-r--r-- | mesalib/docs/egl.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html index a715a3ad3..d946bb0ae 100644 --- a/mesalib/docs/egl.html +++ b/mesalib/docs/egl.html @@ -88,8 +88,11 @@ types such as <code>EGLNativeDisplayType</code> or <code>EGLNativeWindowType</code> defined for.</p> <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. Unless for special needs, the build system should +<code>wayland</code>, <code>null</code>, <code>android</code>, +<code>haiku</code>, and <code>gdi</code>. The <code>android</code> platform +can only be built as a system component, part of AOSP, while the +<code>haiku</code> and <code>gdi</code> platforms can only be built with SCons. +Unless for special needs, the build system should select the right platforms automatically.</p> </dd> |