Changeset 13041 for OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp (modified) (39 diffs)

OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -60 +60 @@
         if (noImages && _images[n].valid()) noImages = false;
         if (noImages && rhs._images[n].valid()) noImages = false;
-    
+
         if (_images[n]!=rhs._images[n]) // smart pointer comparison.
         {
@@ -72 +72 @@
                 else
                 {
-                    return 1; // valid lhs._image is greater than null. 
+                    return 1; // valid lhs._image is greater than null.
                 }
             }
-            else if (rhs._images[n].valid()) 
-            {
-                return -1; // valid rhs._image is greater than null. 
-            }
-        }
-    }
-
-    
+            else if (rhs._images[n].valid())
+            {
+                return -1; // valid rhs._image is greater than null.
+            }
+        }
+    }
+
+
     if (noImages)
     {
@@ -110 +110 @@
         return;
     }
-    
+
     if (_images[layer] == image) return;
 
@@ -144 +144 @@
     }
 }
- 
+
 void Texture2DArray::setTextureSize(int width, int height, int depth)
 {
@@ -154 +154 @@
 
 void Texture2DArray::setTextureDepth(int depth)
-{    
+{
     // if we decrease the number of layers, then delete non-used
     if (depth < _textureDepth)
@@ -161 +161 @@
         _modifiedCount.resize(depth);
     }
-    
+
     // if we increase the array, then add new empty elements
     if (depth > _textureDepth)
@@ -168 +168 @@
         _modifiedCount.resize(depth, ImageModifiedCount());
     }
-        
+
     // resize the texture array
     _textureDepth = depth;
@@ -196 +196 @@
 void Texture2DArray::computeInternalFormat() const
 {
-    if (imagesValid()) computeInternalFormatWithImage(*_images[0]); 
+    if (imagesValid()) computeInternalFormatWithImage(*_images[0]);
     else computeInternalFormatType();
 }
@@ -203 +203 @@
 void Texture2DArray::apply(State& state) const
 {
-    // get the contextID (user defined ID of 0 upwards) for the 
+    // get the contextID (user defined ID of 0 upwards) for the
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
@@ -219 +219 @@
         return;
     }
-    
+
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
@@ -245 +245 @@
     }
 
-    // if we already have an texture object, then 
+    // if we already have an texture object, then
     if (textureObject)
     {
@@ -265 +265 @@
             {
                 osg::Image* image = _images[n].get();
-                
+
                 // if image content is modified, then upload it to the GPU memory
                 if (image && getModifiedCount(n,contextID) != image->getModifiedCount())
@@ -276 +276 @@
 
     }
-    
+
     // there is no texture object, but exists a subload callback, so use it to upload images
     else if (_subloadCallback.valid())
@@ -286 +286 @@
         _subloadCallback->load(*this,state);
     }
-    
+
     // nothing before, but we have valid images, so do manual upload and create texture object manually
     // TODO: we assume _images[0] is valid, however this may not be always the case
@@ -301 +301 @@
         textureObject = generateTextureObject(
                 this, contextID,GL_TEXTURE_2D_ARRAY_EXT,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0);
-        
+
         // bind texture
         textureObject->bind();
@@ -311 +311 @@
         int sourceFormat = _sourceFormat ? _sourceFormat : _internalFormat;
 
-        if( isCompressedInternalFormat( sourceFormat ) && 
+        if( isCompressedInternalFormat( sourceFormat ) &&
             sourceFormat == _internalFormat &&
             extensions->isCompressedTexImage3DSupported() )
@@ -321 +321 @@
         }
         else
-        {   
+        {
             // Override compressed source format with safe GL_RGBA value which not generate error
             // We can safely do this as source format is not important when source data is NULL
@@ -330 +330 @@
                      _textureWidth, _textureHeight, _textureDepth, _borderWidth,
                      sourceFormat, _sourceType ? _sourceType : GL_UNSIGNED_BYTE,
-                     0); 
+                     0);
         }
 
        // For certain we have to manually allocate memory for mipmaps if images are compressed
        // if not allocated OpenGL will produce errors on mipmap upload.
-       // I have not tested if this is neccessary for plain texture formats but 
+       // I have not tested if this is neccessary for plain texture formats but
        // common sense suggests its required as well.
        if( _min_filter != LINEAR && _min_filter != NEAREST && _images[0]->isMipmap() )
@@ -354 +354 @@
 
         const Texture::Extensions* texExtensions = Texture::getExtensions(contextID,true);
-        // source images have no mipmamps but we could generate them...  
-        if( _min_filter != LINEAR && _min_filter != NEAREST && !_images[0]->isMipmap() &&  
+        // source images have no mipmamps but we could generate them...
+        if( _min_filter != LINEAR && _min_filter != NEAREST && !_images[0]->isMipmap() &&
             _useHardwareMipMapGeneration && texExtensions->isGenerateMipMapSupported() )
             {
@@ -363 +363 @@
 
         textureObject->setAllocated(_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0);
-        
+
         // unref image data?
         if (isSafeToUnrefImageData(state))
@@ -369 +369 @@
             Texture2DArray* non_const_this = const_cast<Texture2DArray*>(this);
             for (int n=0; n<_textureDepth; n++)
-            {                
+            {
                 if (_images[n].valid() && _images[n]->getDataVariance()==STATIC)
                 {
@@ -376 +376 @@
             }
         }
-        
-    }
-    
+
+    }
+
     // No images present, but dimensions are set. So create empty texture
     else if ( (_textureWidth > 0) && (_textureHeight > 0) && (_textureDepth > 0) && (_internalFormat!=0) )
     {
-        // generate texture 
+        // generate texture
         _textureObjectBuffer[contextID] = textureObject = generateTextureObject(
                 this, contextID, GL_TEXTURE_2D_ARRAY_EXT,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,_textureDepth,0);
-        
+
         textureObject->bind();
         applyTexParameters(GL_TEXTURE_2D_ARRAY_EXT,state);
-        
+
         extensions->glTexImage3D( GL_TEXTURE_2D_ARRAY_EXT, 0, _internalFormat,
                      _textureWidth, _textureHeight, _textureDepth,
@@ -394 +394 @@
                      _sourceFormat ? _sourceFormat : _internalFormat,
                      _sourceType ? _sourceType : GL_UNSIGNED_BYTE,
-                     0); 
-        
-    }
-    
+                     0);
+
+    }
+
     // nothing before, so just unbind the texture target
     else
@@ -418 +418 @@
         return;
 
-    // get the contextID (user defined ID of 0 upwards) for the 
+    // get the contextID (user defined ID of 0 upwards) for the
     // current OpenGL context.
     const unsigned int contextID = state.getContextID();
-    const Extensions* extensions = getExtensions(contextID,true);    
+    const Extensions* extensions = getExtensions(contextID,true);
     const Texture::Extensions* texExtensions = Texture::getExtensions(contextID,true);
     GLenum target = GL_TEXTURE_2D_ARRAY_EXT;
-    
+
     // compute the internal texture format, this set the _internalFormat to an appropriate value.
     computeInternalFormat();
@@ -437 +437 @@
         // we give a warning and do nothing
         OSG_WARN<<"Warning: Texture2DArray::applyTexImage2DArray_subload(..) the given layer number exceeds the maximum number of supported layers."<<std::endl;
-        return;        
+        return;
     }
 
@@ -447 +447 @@
 
     // image size or format has changed, this is not allowed, hence return
-    if (image->s()!=inwidth || 
-        image->t()!=inheight || 
-        image->getInternalTextureFormat()!=inInternalFormat ) 
+    if (image->s()!=inwidth ||
+        image->t()!=inheight ||
+        image->getInternalTextureFormat()!=inInternalFormat )
     {
         OSG_WARN<<"Warning: Texture2DArray::applyTexImage2DArray_subload(..) given image do have wrong dimension or internal format."<<std::endl;
-        return;        
-    }    
-    
+        return;
+    }
+
     glPixelStorei(GL_UNPACK_ALIGNMENT,image->getPacking());
 #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
@@ -460 +460 @@
 #endif
 
-    bool useHardwareMipmapGeneration = 
+    bool useHardwareMipmapGeneration =
         !image->isMipmap() && _useHardwareMipMapGeneration && texExtensions->isGenerateMipMapSupported();
 
@@ -481 +481 @@
                                       image->data() );
         }
-        
+
         // if we support compression and image is compressed, then
         else if (extensions->isCompressedTexImage3DSupported())
@@ -491 +491 @@
 
             extensions->glCompressedTexSubImage3D(target, 0,
-                0, 0, indepth,  
-                inwidth, inheight, 1, 
+                0, 0, indepth,
+                inwidth, inheight, 1,
                 (GLenum)image->getPixelFormat(),
-                size, 
+                size,
                 image->data());
         }
@@ -526 +526 @@
 
                     extensions->glTexSubImage3D( target, k, 0, 0, indepth,
-                                              width, height, 1, 
+                                              width, height, 1,
                                               (GLenum)image->getPixelFormat(),
                                               (GLenum)image->getDataType(),
@@ -599 +599 @@
     // get the texture object for the current contextID.
     TextureObject* textureObject = getTextureObject(contextID);
-    
+
     if (textureObject && _textureWidth != 0 && _textureHeight != 0 && _textureDepth != 0)
-    {        
+    {
         const Extensions* extensions = getExtensions(contextID,true);
 
@@ -608 +608 @@
         // Make sure source format does not contain compressed formats value (like DXT3)
         // they are invalid when passed to glTexImage3D source format parameter
-        if( isCompressedInternalFormat( safeSourceFormat ) ) 
+        if( isCompressedInternalFormat( safeSourceFormat ) )
         {
             if( safeSourceFormat != _internalFormat || !extensions->isCompressedTexImage3DSupported() )
@@ -625 +625 @@
         width >>= 1;
         height >>= 1;
-        
+
         for( GLsizei k = 1; k < numMipmapLevels  && (width || height); k++)
         {
@@ -633 +633 @@
                 height = 1;
 
-            if( isCompressedInternalFormat(safeSourceFormat) ) 
+            if( isCompressedInternalFormat(safeSourceFormat) )
             {
                 int size = 0, blockSize = 0;
@@ -639 +639 @@
                 getCompressedSize( _internalFormat, width, height, _textureDepth, blockSize, size);
 
-                extensions->glCompressedTexImage3D( GL_TEXTURE_2D_ARRAY_EXT, k, _internalFormat, 
+                extensions->glCompressedTexImage3D( GL_TEXTURE_2D_ARRAY_EXT, k, _internalFormat,
                                                     width, height, _textureDepth, _borderWidth,
                                                     size,
@@ -648 +648 @@
                 extensions->glTexImage3D( GL_TEXTURE_2D_ARRAY_EXT, k, _internalFormat,
                      width, height, _textureDepth, _borderWidth,
-                     safeSourceFormat, _sourceType ? _sourceType : GL_UNSIGNED_BYTE, 
+                     safeSourceFormat, _sourceType ? _sourceType : GL_UNSIGNED_BYTE,
                      NULL);
             }
@@ -655 +655 @@
             height >>= 1;
         }
-                
+
         // inform state that this texture is the current one bound.
-        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);        
+        state.haveAppliedTextureAttribute(state.getActiveTextureUnit(), this);
     }
 }
@@ -685 +685 @@
     _isTexture3DSupported = rhs._isTexture3DSupported;
     _isTexture2DArraySupported = rhs._isTexture2DArraySupported;
-    
+
     _max2DSize = rhs._max2DSize;
     _maxLayerCount = rhs._maxLayerCount;
-    
+
     _glTexImage3D = rhs._glTexImage3D;
     _glTexSubImage3D = rhs._glTexSubImage3D;