diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-07-11 21:38:16 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-09-15 13:14:43 +0100 |
| commit | 533b3530c1292a39ea12437d1376c77bc7e584b9 (patch) | |
| tree | 9eb840d793ee592449eb6d356a10be201bca1e02 /src/mapi/glapi | |
| parent | 2ac09ac5a52b133934c2d96683eab40b9555fdb1 (diff) | |
| download | external_mesa3d-533b3530c1292a39ea12437d1376c77bc7e584b9.zip external_mesa3d-533b3530c1292a39ea12437d1376c77bc7e584b9.tar.gz external_mesa3d-533b3530c1292a39ea12437d1376c77bc7e584b9.tar.bz2 | |
direct-to-native-GL for GLX clients on Cygwin ("Windows-DRI")
Structurally, this is very similar to the existing Apple-DRI code, except I
have chosen to implement this using the __GLXDRIdisplay, etc. vtables (as
suggested originally in [1]), rather than a maze of ifdefs. This also means
that LIBGL_ALWAYS_SOFTWARE and LIBGL_ALWAYS_INDIRECT work as expected.
[1] https://lists.freedesktop.org/archives/mesa-dev/2010-May/000756.html
This adds:
* the Windows-DRI extension protocol headers and the windowsdriproto.pc
file, for use in building the Windows-DRI extension for the X server
* a Windows-DRI extension helper client library
* a Windows-specific DRI implementation for GLX clients
The server is queried for Windows-DRI extension support on the screen before
using it (to detect the case where WGL is disabled or can't be activated).
The server is queried for fbconfigID to pixelformatindex mapping, which is
used to augment glx_config.
The server is queried for a native handle for the drawable (which is of a
different type for windows, pixmaps and pbuffers), which is used to augment
__GLXDRIdrawable.
Various GLX extensions are enabled depending on if the equivalent WGL
extension is available.
Diffstat (limited to 'src/mapi/glapi')
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 3 | ||||
| -rw-r--r-- | src/mapi/glapi/glapi.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 0d7c338..ba5d144 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -32,6 +32,9 @@ MESA_GLAPI_OUTPUTS = \ if HAVE_APPLEDRI MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c endif +if HAVE_WINDOWSDRI +MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c +endif MESA_GLAPI_ASM_OUTPUTS = if HAVE_X86_ASM diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h index 3593c88..f1ad4c1 100644 --- a/src/mapi/glapi/glapi.h +++ b/src/mapi/glapi/glapi.h @@ -158,7 +158,7 @@ _GLAPI_EXPORT const char * _glapi_get_proc_name(unsigned int offset); -#ifdef GLX_USE_APPLEGL +#if defined(GLX_USE_APPLEGL) || defined(GLX_USE_WINDOWSGL) _GLAPI_EXPORT struct _glapi_table * _glapi_create_table_from_handle(void *handle, const char *symbol_prefix); #endif |