diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-03-22 14:40:37 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-03-30 11:13:57 -0400 |
| commit | 77bdaa1313aa55191b49ec73c1e377928ca294fe (patch) | |
| tree | c0ebdfac9902954aa83338716c94b4640e7e0977 /hw/xquartz | |
| parent | 15af78fc56569dc3b6a7f2c5a6a49edb602111b7 (diff) | |
glx: Use __glXInitExtensionEnableBits in all backends (v2)
On xquartz this enables SGI_make_current_read, which is a mostly
harmless lie as CGL doesn't implement it, as well as SGIX_pbuffer, which
is fine because no pbuffer-enabled configs are created.
On xwin this enables SGIX_pbuffer and ARB_multisample in all cases.
Again this is harmless if the backend doesn't support the features,
since no fbconfigs will be created to expose them.
It also adds SGIX_visual_select_group to both xquartz and xwin.
Amusingly, both were filling in the appropriate field in the fbconfig
already.
v2: Warn about missing WGL extensions (Emil)
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/xquartz')
| -rw-r--r-- | hw/xquartz/GL/indirect.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c index 544cb780c..398cdf158 100644 --- a/hw/xquartz/GL/indirect.c +++ b/hw/xquartz/GL/indirect.c @@ -545,22 +545,12 @@ __glXAquaScreenProbe(ScreenPtr pScreen) screen->base.fbconfigs = __glXAquaCreateVisualConfigs( &screen->base.numFBConfigs, pScreen->myNum); + __glXInitExtensionEnableBits(screen->glx_enable_bits); __glXScreenInit(&screen->base, pScreen); screen->base.GLXmajor = 1; screen->base.GLXminor = 4; - memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES); - - __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info"); - __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating"); - __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context"); - __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method"); - __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig"); - - __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample"); - __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample"); - //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context"); //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile"); |