diff options
author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
tree | 1dbf32344313ad7e5884e6686251cad398a231fa /mesalib/docs/egl.html | |
parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'mesalib/docs/egl.html')
-rw-r--r-- | mesalib/docs/egl.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html index 240cec53a..dc2324194 100644 --- a/mesalib/docs/egl.html +++ b/mesalib/docs/egl.html @@ -88,7 +88,7 @@ drivers will be installed to <code>${libdir}/egl</code>.</p> <dd> <p>List the platforms (window systems) to support. Its argument is a comma -seprated string such as <code>--with-egl-platforms=x11,drm</code>. It decides +separated 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 @@ -223,7 +223,7 @@ the X server directly using (XCB-)DRI2 protocol.</p> <dd> <p>This driver is based on Gallium3D. It supports all rendering APIs and -hardwares supported by Gallium3D. It is the only driver that supports OpenVG. +hardware supported by Gallium3D. It is the only driver that supports OpenVG. The supported platforms are X11, DRM, FBDEV, and GDI.</p> <p>This driver comes with its own hardware drivers @@ -273,8 +273,8 @@ longer than the display that creates them.</p> <p>In EGL, when a display is terminated through <code>eglTerminate</code>, all display resources should be destroyed. Similarly, when a thread is released -throught <code>eglReleaseThread</code>, all current display resources should be -released. Another way to destory or release resources is through functions +through <code>eglReleaseThread</code>, all current display resources should be +released. Another way to destroy or release resources is through functions such as <code>eglDestroySurface</code> or <code>eglMakeCurrent</code>.</p> <p>When a resource that is current to some thread is destroyed, the resource |