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>
This commit is contained in:
parent
410aec8255
commit
f95645c6f7
@ -86,7 +86,7 @@ static const struct extension_info known_glx_extensions[] = {
|
|||||||
{ GLX(EXT_framebuffer_sRGB), VER(0,0), N, },
|
{ GLX(EXT_framebuffer_sRGB), VER(0,0), N, },
|
||||||
{ GLX(EXT_import_context), VER(0,0), Y, },
|
{ GLX(EXT_import_context), VER(0,0), Y, },
|
||||||
{ GLX(EXT_stereo_tree), VER(0,0), N, },
|
{ 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_info), VER(0,0), Y, },
|
||||||
{ GLX(EXT_visual_rating), VER(0,0), Y, },
|
{ GLX(EXT_visual_rating), VER(0,0), Y, },
|
||||||
|
|
||||||
|
@ -909,7 +909,8 @@ initializeExtensions(__GLXDRIscreen * screen)
|
|||||||
|
|
||||||
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
|
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
|
||||||
screen->texBuffer = (const __DRItexBufferExtension *) extensions[i];
|
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,
|
LogMessage(X_INFO,
|
||||||
"AIGLX: GLX_EXT_texture_from_pixmap backed by buffer objects\n");
|
"AIGLX: GLX_EXT_texture_from_pixmap backed by buffer objects\n");
|
||||||
}
|
}
|
||||||
|
@ -426,7 +426,8 @@ initializeExtensions(__GLXDRIscreen * screen)
|
|||||||
|
|
||||||
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
|
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
|
||||||
screen->texBuffer = (const __DRItexBufferExtension *) extensions[i];
|
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
|
#ifdef __DRI2_FLUSH_CONTROL
|
||||||
|
Loading…
Reference in New Issue
Block a user