diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-03-22 14:37:19 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-03-30 10:47:55 -0400 |
| commit | f95645c6f70019316f8ad77b7beb84530fc0505f (patch) | |
| tree | 0e449b820cd14e9e0ba4a0937d60998c046a82cc | |
| parent | 410aec82556def5395f51299bcefbeb7d0bda604 (diff) | |
glx: Don't enable EXT_texture_from_pixmap unconditionally
Not all backend servers implement this. Those that don't happen to not
use __glXInitExtensionEnableBits, but we'd like that to change, so fix
it up before we switch them over.
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 | 3 | ||||
| -rw-r--r-- | glx/glxdriswrast.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/glx/extension_string.c b/glx/extension_string.c index 616c7932e..30c341646 100644 --- a/glx/extension_string.c +++ b/glx/extension_string.c @@ -86,7 +86,7 @@ static const struct extension_info known_glx_extensions[] = { { GLX(EXT_framebuffer_sRGB), VER(0,0), N, }, { GLX(EXT_import_context), VER(0,0), Y, }, { GLX(EXT_stereo_tree), VER(0,0), N, }, - { GLX(EXT_texture_from_pixmap), VER(0,0), Y, }, + { GLX(EXT_texture_from_pixmap), VER(0,0), N, }, { GLX(EXT_visual_info), VER(0,0), Y, }, { GLX(EXT_visual_rating), VER(0,0), Y, }, diff --git a/glx/glxdri2.c b/glx/glxdri2.c index 2a7c1e30e..c56a37678 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -909,7 +909,8 @@ initializeExtensions(__GLXDRIscreen * screen) if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) { screen->texBuffer = (const __DRItexBufferExtension *) extensions[i]; - /* GLX_EXT_texture_from_pixmap is always enabled. */ + __glXEnableExtension(screen->glx_enable_bits, + "GLX_EXT_texture_from_pixmap"); LogMessage(X_INFO, "AIGLX: GLX_EXT_texture_from_pixmap backed by buffer objects\n"); } diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index cb57e9a9a..84fd3a1c7 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -426,7 +426,8 @@ initializeExtensions(__GLXDRIscreen * screen) if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) { screen->texBuffer = (const __DRItexBufferExtension *) extensions[i]; - /* GLX_EXT_texture_from_pixmap is always enabled. */ + __glXEnableExtension(screen->glx_enable_bits, + "GLX_EXT_texture_from_pixmap\n"); } #ifdef __DRI2_FLUSH_CONTROL |