From bb2272992b23abb387e8469607c2299a4104ffe4 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 3 Dec 2008 18:00:05 +0000 Subject: [PATCH] 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. --- ChangeLog | 10 ++++++++++ clutter/glx/clutter-glx-texture-pixmap.c | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46109caf9..fa2c16e52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-12-03 Robert Bragg + + 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 Bug 1305 - NPOT textures unaligned to a pixel sometimes have diff --git a/clutter/glx/clutter-glx-texture-pixmap.c b/clutter/glx/clutter-glx-texture-pixmap.c index a76ff30d9..169ee209e 100644 --- a/clutter/glx/clutter-glx-texture-pixmap.c +++ b/clutter/glx/clutter-glx-texture-pixmap.c @@ -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 ? */