Changeset 12986

Timestamp:

02/20/12 13:03:14 (15 months ago)

Author:

robert

Message:

From Johannes Baeurele, "The osg::Image class now contains a 'supportsTextureSubloading()' method that is used inside the Texture2D::apply method. For now it only checks for the etc1 format in which case it returns 'false'. All other formats lead to a return value of 'true'.

Without the change the application does not work properly. First I get the notification that an OpenGL error occured. After some more of this error messages I see broken textures on the screen. With the changes attached to this message my application works as intended."

Note from Robert Osfield, changed the Image::supportsTextureSubloading() to be const and to be implemented in the .cpp rather than inline.

Location:

OpenSceneGraph/trunk

Files:

• include/osg/Image (modified) (2 diffs)
• src/osg/Image.cpp (modified) (1 diff)
• src/osg/Texture2D.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/Image

@@ -93 +93 @@
 #endif
 
+#ifndef GL_OES_compressed_ETC1_RGB8_texture
+    #define GL_ETC1_RGB8_OES        0x8D64   
+#endif
+
 namespace osg {
 
@@ -397 +401 @@
         }
 
+        /** returns false for texture formats that do not support texture subloading */
+        bool supportsTextureSubloading() const;
+
         /** Return true if this image is translucent - i.e. it has alpha values that are less 1.0 (when normalized). */
         virtual bool isImageTranslucent() const;

OpenSceneGraph/trunk/src/osg/Image.cpp

@@ -1432 +1432 @@
 }
 
+bool Image::supportsTextureSubloading() const
+{
+    switch(_internalTextureFormat)
+    {
+        case GL_ETC1_RGB8_OES:
+            return false;
+        default:
+            return true;
+    }
+}
+
 
 template <typename T>    

OpenSceneGraph/trunk/src/osg/Texture2D.cpp

@@ -248 +248 @@
         applyTexParameters(GL_TEXTURE_2D,state);
 
-        if (textureObject->isAllocated())
+        if (textureObject->isAllocated() && image->supportsTextureSubloading())
         {
             //OSG_NOTICE<<"Reusing texture object"<<std::endl;