FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for PixelBufferObject to Texture2DArray

Browse Source
This commit is contained in:
Robert Osfield 2018-02-10 17:50:39 +00:00
parent 79f9cfae80
commit a7839d77cd
1 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/osg/Texture2DArray.cpp
View File

@ -17,6 +17,7 @@
#include <string.h> #include <string.h>
//#define DO_TIMING
using namespace osg; using namespace osg;
@ -454,6 +455,13 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
if (!imagesValid()) if (!imagesValid())
return; return;
#ifdef DO_TIMING
osg::Timer_t start_tick = osg::Timer::instance()->tick();
OSG_NOTICE<<"Texture2DArray::applyTexImage2DArray_subload() = "<<(void*)image<<std::endl;
#endif
const unsigned int contextID = state.getContextID();
// 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. // current OpenGL context.
const GLExtensions* extensions = state.get<GLExtensions>(); const GLExtensions* extensions = state.get<GLExtensions>();
@ -494,11 +502,29 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength()); glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength());
#endif #endif
bool useHardwareMipmapGeneration = bool mipmappingRequired = _min_filter != LINEAR && _min_filter != NEAREST;
!image->isMipmap() && _useHardwareMipMapGeneration && extensions->isGenerateMipMapSupported; bool useHardwareMipMapGeneration = mipmappingRequired && !image->isMipmap();
unsigned char* dataPtr = (unsigned char*)image->data();
GLBufferObject* pbo = image->getOrCreateGLBufferObject(contextID);
if (pbo)
{
state.bindPixelBufferObject(pbo);
dataPtr = reinterpret_cast<unsigned char*>(pbo->getOffset(image->getBufferIndex()));
}
else
{
pbo = 0;
}
#ifdef DO_TIMING
OSG_NOTICE<<" Texture2DArray::applyTexImage2DArray_subload() pbo="<<pbo<<", before copy time = "<<osg::Timer::instance()->delta_m(start_tick,osg::Timer::instance()->tick())<<"ms"<<std::endl;
start_tick = osg::Timer::instance()->tick();
#endif
// if no special mipmapping is required, then // if no special mipmapping is required, then
if( _min_filter == LINEAR || _min_filter == NEAREST || useHardwareMipmapGeneration ) if( _min_filter == LINEAR || _min_filter == NEAREST || useHardwareMipMapGeneration )
{ {
if( _min_filter == LINEAR || _min_filter == NEAREST ) if( _min_filter == LINEAR || _min_filter == NEAREST )
numMipmapLevels = 1; numMipmapLevels = 1;
@ -508,12 +534,15 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
// upload non-compressed image // upload non-compressed image
if ( !compressed_image ) if ( !compressed_image )
{ {
//OSG_NOTICE<<"Texture2DArray::applyTexImage2DArray_subload()"<<std::endl;
#if 1
extensions->glTexSubImage3D( target, 0, extensions->glTexSubImage3D( target, 0,
0, 0, layer, 0, 0, layer,
inwidth, inheight, indepth, inwidth, inheight, indepth,
(GLenum)image->getPixelFormat(), (GLenum)image->getPixelFormat(),
(GLenum)image->getDataType(), (GLenum)image->getDataType(),
image->data() ); dataPtr );
#endif
} }
// if we support compression and image is compressed, then // if we support compression and image is compressed, then
@ -529,7 +558,7 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
inwidth, inheight, indepth, inwidth, inheight, indepth,
(GLenum)image->getPixelFormat(), (GLenum)image->getPixelFormat(),
size, size,
image->data()); dataPtr);
} }
// we want to use mipmapping, so enable it // we want to use mipmapping, so enable it
@ -565,7 +594,7 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
width, height, indepth, width, height, indepth,
(GLenum)image->getPixelFormat(), (GLenum)image->getPixelFormat(),
(GLenum)image->getDataType(), (GLenum)image->getDataType(),
image->getMipmapData(k)); dataPtr + image->getMipmapOffset(k));
width >>= 1; width >>= 1;
height >>= 1; height >>= 1;
@ -589,7 +618,7 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
width, height, indepth, width, height, indepth,
(GLenum)image->getPixelFormat(), (GLenum)image->getPixelFormat(),
size, size,
image->getMipmapData(k)); dataPtr + image->getMipmapOffset(k));
// state.checkGLErrors("after extensions->glCompressedTexSubImage3D("); // state.checkGLErrors("after extensions->glCompressedTexSubImage3D(");
@ -600,6 +629,14 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
} }
} }
if (pbo)
{
state.unbindPixelBufferObject();
}
#ifdef DO_TIMING
OSG_NOTICE<<" Texture2DArray::applyTexImage2DArray_subload() pbo="<<pbo<<", copy time = "<<osg::Timer::instance()->delta_m(start_tick,osg::Timer::instance()->tick())<<"ms"<<std::endl;
#endif
} }