From 56daae9d7bc49a29a4e1c4e093928efb747ed675 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Thu, 20 Aug 2009 12:53:32 +0100 Subject: [PATCH] Revert "[cogl] Allow Cogl to create NPOT textures for GLES2" This reverts commit 3c47a3beb51462ef8af1070b75123660059e97d0. Of course I remembered just after pushing the patch why we hadn't done this before :-) If you look in the glsl spec: http://www.khronos.org/registry/gles/specs/2.0/es_full_spec_2.0.24.pdf Section 3.7.10 Texture Completeness and Non-Power-Of-Two Textures you can see GLES 2.0 doesn't support mipmaps for npot textures. There is possibly some way we could support this in Cogl but at least it's not as simple as or-ing in the feature flag, sadly. --- clutter/cogl/gles/cogl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clutter/cogl/gles/cogl.c b/clutter/cogl/gles/cogl.c index e56b2c80b..0fcf4fc3b 100644 --- a/clutter/cogl/gles/cogl.c +++ b/clutter/cogl/gles/cogl.c @@ -62,8 +62,7 @@ _cogl_features_init (void) flags |= COGL_FEATURE_FOUR_CLIP_PLANES; #ifdef HAVE_COGL_GLES2 - flags |= COGL_FEATURE_SHADERS_GLSL | COGL_FEATURE_OFFSCREEN - | COGL_FEATURE_TEXTURE_NPOT; + flags |= COGL_FEATURE_SHADERS_GLSL | COGL_FEATURE_OFFSCREEN; #endif flags |= COGL_FEATURE_VBOS;