From a88155a198f96f69828b55c3056dfa1f6e23f9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 23 Jan 2014 21:43:32 +0100 Subject: [PATCH] Actually make use of EXT_texture_storage on ES2. Currently it was ignored when deciding about *Texture::setStorage() implementation. --- src/Magnum/Implementation/TextureState.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Implementation/TextureState.cpp b/src/Magnum/Implementation/TextureState.cpp index 7bc771d66..5b9988bb4 100644 --- a/src/Magnum/Implementation/TextureState.cpp +++ b/src/Magnum/Implementation/TextureState.cpp @@ -114,13 +114,16 @@ TextureState::TextureState(Context& context, std::vector& extension #endif /* Texture storage implementation */ - #ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES if(context.isExtensionSupported()) + #elif defined(MAGNUM_TARGET_GLES2) + if(context.isExtensionSupported()) #endif { #ifndef MAGNUM_TARGET_GLES extensions.push_back(Extensions::GL::ARB::texture_storage::string()); + #elif defined(MAGNUM_TARGET_GLES2) + extensions.push_back(Extensions::GL::EXT::texture_storage::string()); #endif #ifndef MAGNUM_TARGET_GLES @@ -138,12 +141,8 @@ TextureState::TextureState(Context& context, std::vector& extension storage3DImplementation = &AbstractTexture::storageImplementationDefault; } } - #endif #ifndef MAGNUM_TARGET_GLES3 - #ifndef MAGNUM_TARGET_GLES - else - #endif - { + else { #ifndef MAGNUM_TARGET_GLES storage1DImplementation = &AbstractTexture::storageImplementationFallback; #endif