From 1e75ca63f46b6ae3de7e42b88435bedc3925b4db Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 20 Nov 2014 10:05:52 +0000 Subject: [PATCH] From Christian Ruzicka, "while testing this commit on our OSG 3.2 version, I observed that the changes for ETC2 brake ETC1 support. Attached you'll find the changes to get ETC1 running again" git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14501 16af8721-9629-0410-8352-f15c8da7e697 --- src/osg/Texture.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 8ae79b685..d58796da8 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -1814,6 +1814,8 @@ void Texture::getCompressedSize(GLenum internalFormat, GLint width, GLint height blockSize = 8; else if (internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT || internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT) blockSize = 16; + else if (internalFormat == GL_ETC1_RGB8_OES) + blockSize = 8; else if (internalFormat == GL_COMPRESSED_RGB8_ETC2 || internalFormat == GL_COMPRESSED_SRGB8_ETC2) blockSize = 8; else if (internalFormat == GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 || internalFormat == GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2)