2008-07-10 Matthew Allum <mallum@openedhand.com>

* clutter/glx/clutter-glx-texture-pixmap.c:
        Assume TFP npots sized textures are always supported if TFP ext is!
        (Based on patch from James Ketrenos)
This commit is contained in:
Matthew Allum 2008-07-10 00:12:23 +00:00
parent 34f6defca9
commit 18e1dfb232
2 changed files with 12 additions and 6 deletions

View File

@ -1,3 +1,9 @@
2008-07-10 Matthew Allum <mallum@openedhand.com>
* clutter/glx/clutter-glx-texture-pixmap.c:
Assume TFP npots sized textures are always supported if TFP ext is!
(Based on patch from James Ketrenos)
2008-07-08 Matthew Allum <mallum@openedhand.com> 2008-07-08 Matthew Allum <mallum@openedhand.com>
Bug 1011 - Fix TFP fallback mechanism (take 2) Bug 1011 - Fix TFP fallback mechanism (take 2)

View File

@ -507,10 +507,7 @@ clutter_glx_texture_pixmap_create_glx_pixmap (ClutterGLXTexturePixmap *texture)
attribs[i++] = GLX_TEXTURE_TARGET_EXT; attribs[i++] = GLX_TEXTURE_TARGET_EXT;
if (clutter_feature_available (COGL_FEATURE_TEXTURE_NPOT)) attribs[i++] = GLX_TEXTURE_2D_EXT;
attribs[i++] = GLX_TEXTURE_2D_EXT;
else
attribs[i++] = GLX_TEXTURE_RECTANGLE_EXT;
attribs[i++] = None; attribs[i++] = None;
@ -661,8 +658,11 @@ clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixmap *texture)
priv = CLUTTER_GLX_TEXTURE_PIXMAP (texture)->priv; priv = CLUTTER_GLX_TEXTURE_PIXMAP (texture)->priv;
return (_have_tex_from_pixmap_ext return (_have_tex_from_pixmap_ext);
&& clutter_feature_available (COGL_FEATURE_TEXTURE_NPOT)); /* Assume NPOT TFP's are supported even if regular NPOT isn't advertised
* but tfp is. Seemingly some Intel drivers do this ?
*/
/* && clutter_feature_available (COGL_FEATURE_TEXTURE_NPOT)); */
} }
/** /**