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

From Farshid Lashkari,

Browse Source 
"I was experiencing hard crashes of my application when using PBO's on
machines that don't support PBO's. I think osg incorrectly checks if
PBO's are supported.

I added a new method to the BufferObject::Extensions class which
returns if the "GL_ARB_pixel_buffer_object" string is supported. This
fixes the problem on my end. Machines without PBO support will
continue to work and machines with PBO support will still be able to
use it."
This commit is contained in:
Robert Osfield 2006-08-25 08:48:16 +00:00
parent 8365ec3217
commit 0900857333
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osg/BufferObject
View File

@ -106,6 +106,7 @@ class OSG_EXPORT BufferObject : public Object
}; };
inline bool isBufferObjectSupported(unsigned int contextID) const { return getExtensions(contextID,true)->isBufferObjectSupported(); } inline bool isBufferObjectSupported(unsigned int contextID) const { return getExtensions(contextID,true)->isBufferObjectSupported(); }
inline bool isPBOSupported(unsigned int contextID) const { return getExtensions(contextID,true)->isPBOSupported(); }
inline GLuint& buffer(unsigned int contextID) const { return _bufferObjectList[contextID]; } inline GLuint& buffer(unsigned int contextID) const { return _bufferObjectList[contextID]; }
@ -153,6 +154,7 @@ class OSG_EXPORT BufferObject : public Object
void setupGLExtenions(unsigned int contextID); void setupGLExtenions(unsigned int contextID);
bool isBufferObjectSupported() const { return _glGenBuffers!=0; } bool isBufferObjectSupported() const { return _glGenBuffers!=0; }
bool isPBOSupported() const { return _isPBOSupported; }
void glGenBuffers (GLsizei n, GLuint *buffers) const; void glGenBuffers (GLsizei n, GLuint *buffers) const;
void glBindBuffer (GLenum target, GLuint buffer) const; void glBindBuffer (GLenum target, GLuint buffer) const;
@ -192,6 +194,7 @@ class OSG_EXPORT BufferObject : public Object
GetBufferParameterivProc _glGetBufferParameteriv; GetBufferParameterivProc _glGetBufferParameteriv;
GetBufferPointervProc _glGetBufferPointerv; GetBufferPointervProc _glGetBufferPointerv;
bool _isPBOSupported;
}; };
/** Function to call to get the extension of a specified context. /** Function to call to get the extension of a specified context.

3
src/osg/BufferObject.cpp
View File

@ -182,7 +182,7 @@ void BufferObject::Extensions::lowestCommonDenominator(const Extensions& rhs)
if (!rhs._glGetBufferParameteriv) _glGetBufferPointerv = rhs._glGetBufferPointerv; if (!rhs._glGetBufferParameteriv) _glGetBufferPointerv = rhs._glGetBufferPointerv;
} }
void BufferObject::Extensions::setupGLExtenions(unsigned int) void BufferObject::Extensions::setupGLExtenions(unsigned int contextID)
{ {
_glGenBuffers = ((GenBuffersProc)osg::getGLExtensionFuncPtr("glGenBuffers","glGenBuffersARB")); _glGenBuffers = ((GenBuffersProc)osg::getGLExtensionFuncPtr("glGenBuffers","glGenBuffersARB"));
_glBindBuffer = ((BindBufferProc)osg::getGLExtensionFuncPtr("glBindBuffer","glBindBufferARB")); _glBindBuffer = ((BindBufferProc)osg::getGLExtensionFuncPtr("glBindBuffer","glBindBufferARB"));
@ -195,6 +195,7 @@ void BufferObject::Extensions::setupGLExtenions(unsigned int)
_glUnmapBuffer = ((UnmapBufferProc)osg::getGLExtensionFuncPtr("glUnmapBuffer","glUnmapBufferARB")); _glUnmapBuffer = ((UnmapBufferProc)osg::getGLExtensionFuncPtr("glUnmapBuffer","glUnmapBufferARB"));
_glGetBufferParameteriv = ((GetBufferParameterivProc)osg::getGLExtensionFuncPtr("glGetBufferParameteriv","glGetBufferParameterivARB")); _glGetBufferParameteriv = ((GetBufferParameterivProc)osg::getGLExtensionFuncPtr("glGetBufferParameteriv","glGetBufferParameterivARB"));
_glGetBufferPointerv = ((GetBufferPointervProc)osg::getGLExtensionFuncPtr("glGetBufferPointerv","glGetBufferPointervARB")); _glGetBufferPointerv = ((GetBufferPointervProc)osg::getGLExtensionFuncPtr("glGetBufferPointerv","glGetBufferPointervARB"));
_isPBOSupported = osg::isGLExtensionSupported(contextID,"GL_ARB_pixel_buffer_object");
} }
void BufferObject::Extensions::glGenBuffers(GLsizei n, GLuint *buffers) const void BufferObject::Extensions::glGenBuffers(GLsizei n, GLuint *buffers) const

4
src/osg/Texture.cpp
View File

@ -897,7 +897,7 @@ void Texture::applyTexImage2D_load(State& state, GLenum target, const Image* ima
unsigned char* dataPlusOffset = 0; unsigned char* dataPlusOffset = 0;
const PixelBufferObject* pbo = image->getPixelBufferObject(); const PixelBufferObject* pbo = image->getPixelBufferObject();
if (pbo && pbo->isBufferObjectSupported(contextID) && !needImageRescale) if (pbo && pbo->isPBOSupported(contextID) && !needImageRescale)
{ {
pbo->compileBuffer(state); pbo->compileBuffer(state);
pbo->bindBuffer(contextID); pbo->bindBuffer(contextID);
@ -1149,7 +1149,7 @@ void Texture::applyTexImage2D_subload(State& state, GLenum target, const Image*
unsigned char* dataPlusOffset=0; unsigned char* dataPlusOffset=0;
const PixelBufferObject* pbo = image->getPixelBufferObject(); const PixelBufferObject* pbo = image->getPixelBufferObject();
if (pbo && pbo->isBufferObjectSupported(contextID) && !needImageRescale) if (pbo && pbo->isPBOSupported(contextID) && !needImageRescale)
{ {
pbo->compileBuffer(state); pbo->compileBuffer(state);
pbo->bindBuffer(contextID); pbo->bindBuffer(contextID);

4
src/osg/TextureRectangle.cpp
View File

@ -283,7 +283,7 @@ void TextureRectangle::applyTexImage_load(GLenum target, Image* image, State& st
unsigned char* dataPlusOffset = 0; unsigned char* dataPlusOffset = 0;
const PixelBufferObject* pbo = image->getPixelBufferObject(); const PixelBufferObject* pbo = image->getPixelBufferObject();
if (pbo && pbo->isBufferObjectSupported(contextID)) if (pbo && pbo->isPBOSupported(contextID))
{ {
pbo->compileBuffer(state); pbo->compileBuffer(state);
pbo->bindBuffer(contextID); pbo->bindBuffer(contextID);
@ -350,7 +350,7 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
unsigned char* dataPlusOffset = 0; unsigned char* dataPlusOffset = 0;
const PixelBufferObject* pbo = image->getPixelBufferObject(); const PixelBufferObject* pbo = image->getPixelBufferObject();
if (pbo && pbo->isBufferObjectSupported(contextID)) if (pbo && pbo->isPBOSupported(contextID))
{ {
pbo->compileBuffer(state); pbo->compileBuffer(state);
pbo->bindBuffer(contextID); pbo->bindBuffer(contextID);