diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-03-23 15:19:15 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-03-30 11:07:14 -0400 |
| commit | 15af78fc56569dc3b6a7f2c5a6a49edb602111b7 (patch) | |
| tree | ee4758f6cff63d1b29a998b53e175fea8971dbe5 | |
| parent | 9b2fc6d98691966f1c9186edad956f78c31f3698 (diff) | |
glx: Enable GLX_SGI_make_current_read in the core
GLX 1.3 implies equivalent functionality, so this is safe to enable
unconditionally, and bindContext always takes both drawable and readable
arguments in any case. Mesa stopped exporting the __DRI_READ_DRAWABLE
extension in 8.0 (when the DRI1 drivers were removed) so this will
restore the extension string.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | glx/extension_string.c | 2 | ||||
| -rw-r--r-- | glx/glxdri2.c | 7 | ||||
| -rw-r--r-- | glx/glxdriswrast.c | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/glx/extension_string.c b/glx/extension_string.c index 30c341646..7e74090df 100644 --- a/glx/extension_string.c +++ b/glx/extension_string.c @@ -92,7 +92,7 @@ static const struct extension_info known_glx_extensions[] = { { GLX(MESA_copy_sub_buffer), VER(0,0), N, }, { GLX(OML_swap_method), VER(0,0), Y, }, - { GLX(SGI_make_current_read), VER(1,3), N, }, + { GLX(SGI_make_current_read), VER(1,3), Y, }, { GLX(SGI_swap_control), VER(0,0), N, }, { GLX(SGIS_multisample), VER(0,0), Y, }, { GLX(SGIX_fbconfig), VER(1,3), Y, }, diff --git a/glx/glxdri2.c b/glx/glxdri2.c index c56a37678..71dab2ab4 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -900,13 +900,6 @@ initializeExtensions(__GLXDRIscreen * screen) } for (i = 0; extensions[i]; i++) { - if (strcmp(extensions[i]->name, __DRI_READ_DRAWABLE) == 0) { - __glXEnableExtension(screen->glx_enable_bits, - "GLX_SGI_make_current_read"); - - LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n"); - } - if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) { screen->texBuffer = (const __DRItexBufferExtension *) extensions[i]; __glXEnableExtension(screen->glx_enable_bits, diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index 84fd3a1c7..aaf55ca89 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -414,7 +414,6 @@ initializeExtensions(__GLXDRIscreen * screen) __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_framebuffer_sRGB"); __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_fbconfig_float"); __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_fbconfig_packed_float"); - __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_make_current_read"); extensions = screen->core->getExtensions(screen->driScreen); |