Show
Ignore:
Timestamp:
01/24/12 15:34:02 (2 years ago)
Author:
robert
Message:

Added support for using GL_UNPACK_ROW_LENGTH in conjunction with texture's + osg::Image via new RowLength?
parameter in osg::Image. To support this Image::setData(..) now has a new optional rowLength parameter which
defaults to 0, which provides the original behaviour, Image::setRowLength(int) and int Image::getRowLength() are also provided.

With the introduction of RowLength? support in osg::Image it is now possible to create a sub image where
the t size of the image are smaller than the row length, useful for when you have a large image on the CPU
and which to use a small portion of it on the GPU. However, when these sub images are created the data
within the image is no longer contiguous so data access can no longer assume that all the data is in
one block. The new method Image::isDataContiguous() enables the user to check whether the data is contiguous,
and if not one can either access the data row by row using Image::data(column,row,image) accessor, or use the
new Image::DataIterator? for stepping through each block on memory assocatied with the image.

To support the possibility of non contiguous osg::Image usage of image objects has had to be updated to
check DataContiguous? and handle the case or use access via the DataIerator? or by row by row. To achieve
this a relatively large number of files has had to be modified, in particular the texture classes and
image plugins that doing writing.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp

    r11808 r12912  
    313313 
    314314    glPixelStorei(GL_UNPACK_ALIGNMENT, image->getPacking()); 
     315    glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength()); 
    315316 
    316317    bool useClientStorage = extensions->isClientStorageSupported() && getClientStorageHint(); 
     
    393394 
    394395    glPixelStorei(GL_UNPACK_ALIGNMENT, image->getPacking()); 
     396    unsigned int rowLength = image->getRowLength(); 
     397     
    395398 
    396399#ifdef DO_TIMING 
     
    404407        state.bindPixelBufferObject(pbo); 
    405408        dataPtr = reinterpret_cast<unsigned char*>(pbo->getOffset(image->getBufferIndex())); 
     409        rowLength = 0; 
    406410#ifdef DO_TIMING 
    407411        OSG_NOTICE<<"after PBO "<<osg::Timer::instance()->delta_m(start_tick,osg::Timer::instance()->tick())<<"ms"<<std::endl; 
    408412#endif 
    409413    } 
    410      
     414 
     415    glPixelStorei(GL_UNPACK_ROW_LENGTH,rowLength); 
    411416 
    412417    if(isCompressedInternalFormat(_internalFormat) && extensions->isCompressedTexSubImage2DSupported())