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

Moved VBO switching code into inline methods into osg::State to speed performance

Browse Source
This commit is contained in:
Robert Osfield
2007-05-01 06:28:20 +00:00
parent a67111a64c
commit 40db1a8934
12 changed files with 377 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osg/State.cpp
View File

@@ -39,6 +39,10 @@ State::State()
_currentActiveTextureUnit=0;
_currentClientActiveTextureUnit=0;
_currentVBO = 0;
_currentEBO = 0;
_currentPBO = 0;
_isSecondaryColorSupportResolved = false;
_isSecondaryColorSupported = false;
@@ -728,6 +732,7 @@ void State::initializeExtensionProcs()
_glVertexAttribPointer = (VertexAttribPointerProc) osg::getGLExtensionFuncPtr("glVertexAttribPointer","glVertexAttribPointerARB");
_glEnableVertexAttribArray = (EnableVertexAttribProc) osg::getGLExtensionFuncPtr("glEnableVertexAttribArray","glEnableVertexAttribArrayARB");
_glDisableVertexAttribArray = (DisableVertexAttribProc) osg::getGLExtensionFuncPtr("glDisableVertexAttribArray","glDisableVertexAttribArrayARB");
_glBindBuffer = (BindBufferProc) osg::getGLExtensionFuncPtr("glBindBuffer","glBindBufferARB");
_extensionProcsInitialized = true;
}
@@ -736,8 +741,6 @@ bool State::setClientActiveTextureUnit( unsigned int unit )
{
if (unit!=_currentClientActiveTextureUnit)
{
if (!_extensionProcsInitialized) initializeExtensionProcs();
if (_glClientActiveTexture)
{
_glClientActiveTexture(GL_TEXTURE0+unit);
@@ -758,8 +761,6 @@ bool State::setActiveTextureUnit( unsigned int unit )
{
if (unit!=_currentActiveTextureUnit)
{
if (!_extensionProcsInitialized) initializeExtensionProcs();
if (_glActiveTexture)
{
_glActiveTexture(GL_TEXTURE0+unit);
@@ -775,8 +776,6 @@ bool State::setActiveTextureUnit( unsigned int unit )
void State::setFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
{
if (!_extensionProcsInitialized) initializeExtensionProcs();
if (_glFogCoordPointer)
{
@@ -798,8 +797,6 @@ void State::setFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
void State::setSecondaryColorPointer( GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr )
{
if (!_extensionProcsInitialized) initializeExtensionProcs();
if (_glSecondaryColorPointer)
{
if (!_secondaryColorArray._enabled || _secondaryColorArray._dirty)
@@ -822,8 +819,6 @@ void State::setVertexAttribPointer( unsigned int index,
GLint size, GLenum type, GLboolean normalized,
GLsizei stride, const GLvoid *ptr )
{
if (!_extensionProcsInitialized) initializeExtensionProcs();
if (_glVertexAttribPointer)
{
if ( index >= _vertexAttribArrayList.size()) _vertexAttribArrayList.resize(index+1);
@@ -848,8 +843,6 @@ void State::setVertexAttribPointer( unsigned int index,
* note, only updates values that change.*/
void State::disableVertexAttribPointer( unsigned int index )
{
if (!_extensionProcsInitialized) initializeExtensionProcs();
if (_glDisableVertexAttribArray)
{
if ( index >= _vertexAttribArrayList.size()) _vertexAttribArrayList.resize(index+1);
@@ -866,8 +859,6 @@ void State::disableVertexAttribPointer( unsigned int index )
void State::disableVertexAttribPointersAboveAndIncluding( unsigned int index )
{
if (!_extensionProcsInitialized) initializeExtensionProcs();
if (_glDisableVertexAttribArray)
{
while (index<_vertexAttribArrayList.size())