mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 00:20:42 -05:00
Bug 1303 - clutter_glx_texture_pixmap_using_extension doesn't check if
fallbacks are being used * glx/clutter-glx-texture-pixmap.c: clutter_glx_texture_pixmap_using_extension now checks to see if priv->use_fallback is TRUE not just that the tfp extension is available.
This commit is contained in:
parent
55cec1f651
commit
bb2272992b
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2008-12-03 Robert Bragg <robert@linux.intel.com>
|
||||
|
||||
Bug 1303 - clutter_glx_texture_pixmap_using_extension doesn't check if
|
||||
fallbacks are being used
|
||||
|
||||
* glx/clutter-glx-texture-pixmap.c:
|
||||
clutter_glx_texture_pixmap_using_extension now checks to see if
|
||||
priv->use_fallback is TRUE not just that the tfp extension is
|
||||
available.
|
||||
|
||||
2008-12-01 Neil Roberts <neil@linux.intel.com>
|
||||
|
||||
Bug 1305 - NPOT textures unaligned to a pixel sometimes have
|
||||
|
@ -524,8 +524,7 @@ clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture)
|
||||
|
||||
dpy = clutter_x11_get_default_display ();
|
||||
|
||||
if (priv->use_fallback == TRUE
|
||||
|| !clutter_glx_texture_pixmap_using_extension (texture))
|
||||
if (!clutter_glx_texture_pixmap_using_extension (texture))
|
||||
goto cleanup;
|
||||
|
||||
priv->use_fallback = FALSE;
|
||||
@ -744,7 +743,7 @@ clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture)
|
||||
|
||||
priv = CLUTTER_GLX_TEXTURE_PIXMAP (texture)->priv;
|
||||
|
||||
return (_have_tex_from_pixmap_ext);
|
||||
return (_have_tex_from_pixmap_ext && !priv->use_fallback);
|
||||
/* Assume NPOT TFP's are supported even if regular NPOT isn't advertised
|
||||
* but tfp is. Seemingly some Intel drivers do this ?
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user