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

Added check against isVertexBufferObjectSupported() in set*Pointer() methods

Browse Source
This commit is contained in:
Robert Osfield 2013-03-21 16:22:30 +00:00
parent 6c723df2d6
commit ed35a0a07a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/osg/State
View File

@ -614,7 +614,7 @@ class OSG_EXPORT State : public Referenced, public Observer
{ {
if (array) if (array)
{ {
GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID); GLBufferObject* vbo = isVertexBufferObjectSupported() ? array->getOrCreateGLBufferObject(_contextID) : 0;
if (vbo) if (vbo)
{ {
bindVertexBufferObject(vbo); bindVertexBufferObject(vbo);
@ -705,7 +705,7 @@ class OSG_EXPORT State : public Referenced, public Observer
{ {
if (array) if (array)
{ {
GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID); GLBufferObject* vbo = isVertexBufferObjectSupported() ? array->getOrCreateGLBufferObject(_contextID) : 0;
if (vbo) if (vbo)
{ {
bindVertexBufferObject(vbo); bindVertexBufferObject(vbo);
@ -795,7 +795,7 @@ class OSG_EXPORT State : public Referenced, public Observer
{ {
if (array) if (array)
{ {
GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID); GLBufferObject* vbo = isVertexBufferObjectSupported() ? array->getOrCreateGLBufferObject(_contextID) : 0;
if (vbo) if (vbo)
{ {
bindVertexBufferObject(vbo); bindVertexBufferObject(vbo);
@ -890,7 +890,7 @@ class OSG_EXPORT State : public Referenced, public Observer
{ {
if (array) if (array)
{ {
GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID); GLBufferObject* vbo = isVertexBufferObjectSupported() ? array->getOrCreateGLBufferObject(_contextID) : 0;
if (vbo) if (vbo)
{ {
bindVertexBufferObject(vbo); bindVertexBufferObject(vbo);
@ -957,7 +957,7 @@ class OSG_EXPORT State : public Referenced, public Observer
{ {
if (array) if (array)
{ {
GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID); GLBufferObject* vbo = isVertexBufferObjectSupported() ? array->getOrCreateGLBufferObject(_contextID) : 0;
if (vbo) if (vbo)
{ {
bindVertexBufferObject(vbo); bindVertexBufferObject(vbo);
@ -1024,7 +1024,7 @@ class OSG_EXPORT State : public Referenced, public Observer
{ {
if (array) if (array)
{ {
GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID); GLBufferObject* vbo = isVertexBufferObjectSupported() ? array->getOrCreateGLBufferObject(_contextID) : 0;
if (vbo) if (vbo)
{ {
bindVertexBufferObject(vbo); bindVertexBufferObject(vbo);
@ -1199,7 +1199,7 @@ class OSG_EXPORT State : public Referenced, public Observer
{ {
if (array) if (array)
{ {
GLBufferObject* vbo = array->getOrCreateGLBufferObject(_contextID); GLBufferObject* vbo = isVertexBufferObjectSupported() ? array->getOrCreateGLBufferObject(_contextID) : 0;
if (vbo) if (vbo)
{ {
bindVertexBufferObject(vbo); bindVertexBufferObject(vbo);