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

Added lazy state updating for vertex array object binding/unbinding

Browse Source
This commit is contained in:
Robert Osfield
2017-03-13 11:44:34 +00:00
parent a6453ad877
commit ffbc1167de
6 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/osg/State
View File

@@ -563,7 +563,7 @@ class OSG_EXPORT State : public Referenced
void setCurrentPixelBufferObject(osg::GLBufferObject* pbo) { _currentPBO = pbo; }
const GLBufferObject* getCurrentPixelBufferObject() { return _currentPBO; }
const GLBufferObject* getCurrentPixelBufferObject() const { return _currentPBO; }
inline void bindPixelBufferObject(osg::GLBufferObject* pbo)
{
@@ -590,6 +590,17 @@ class OSG_EXPORT State : public Referenced
_currentPBO = 0;
}
void setCurrentVertexArrayObject(GLuint vao) { _currentVAO = vao; }
GLuint getCurrentVertexArrayObject() const { return _currentVAO; }
inline void bindVertexArrayObject(const VertexArrayState* vas) { bindVertexArrayObject(vas->getVertexArrayObject()); }
inline void bindVertexArrayObject(GLuint vao) { if (_currentVAO!=vao) { _glExtensions->glBindVertexArray(vao); _currentVAO = vao; } }
inline void unbindVertexArrayObject() { if (_currentVAO!=0) { _glExtensions->glBindVertexArray(0); _currentVAO = 0; } }
typedef std::vector<GLushort> IndicesGLushort;
IndicesGLushort _quadIndicesGLushort[4];
@@ -1248,6 +1259,7 @@ class OSG_EXPORT State : public Referenced
unsigned int _currentActiveTextureUnit;
unsigned int _currentClientActiveTextureUnit;
GLBufferObject* _currentPBO;
GLuint _currentVAO;
inline ModeMap& getOrCreateTextureModeMap(unsigned int unit)

4
include/osg/VertexArrayState
View File

@@ -164,10 +164,6 @@ public:
void deleteVertexArrayObject();
inline void bindVertexArrayObject() const { _ext->glBindVertexArray (_vertexArrayObject); }
inline void unbindVertexArrayObject() const { _ext->glBindVertexArray (0); }
GLuint getVertexArrayObject() const { return _vertexArrayObject; }