From 65884f296b8ec15e9d55a5c64fa36ac828592c7c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 16 Aug 2016 11:11:24 +0100 Subject: [PATCH] Removed no longer used data structures --- include/osg/State | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/include/osg/State b/include/osg/State index 207fd78de..d1cef0283 100644 --- a/include/osg/State +++ b/include/osg/State @@ -57,20 +57,6 @@ namespace osg { // forward declare GraphicsContext, View and State class GraphicsContext; -struct EnabledArrayPair -{ - EnabledArrayPair():_arrayType(0), _lazy_disable(false),_dirty(true),_enabled(false),_normalized(0),_pointer(0) {} - EnabledArrayPair(const EnabledArrayPair& eap):_arrayType(0), _lazy_disable(eap._lazy_disable),_dirty(eap._dirty), _enabled(eap._enabled),_normalized(eap._normalized),_pointer(eap._pointer) {} - EnabledArrayPair& operator = (const EnabledArrayPair& eap) { _arrayType = eap._arrayType; _lazy_disable = eap._lazy_disable;_dirty=eap._dirty; _enabled=eap._enabled; _normalized=eap._normalized;_pointer=eap._pointer; return *this; } - - GLenum _arrayType; - bool _lazy_disable; - bool _dirty; - bool _enabled; - GLboolean _normalized; - const GLvoid* _pointer; -}; - /** Encapsulates the current applied OpenGL modes, attributes and vertex arrays settings, * implements lazy state updating and provides accessors for querying the current state. * The venerable Red Book says that "OpenGL is a state machine", and this class @@ -1208,30 +1194,6 @@ class OSG_EXPORT State : public Referenced unsigned int _maxBufferObjectPoolSize; - struct EnabledArrayPair - { - EnabledArrayPair():_lazy_disable(false),_dirty(true),_enabled(false),_normalized(0),_pointer(0) {} - EnabledArrayPair(const EnabledArrayPair& eap):_lazy_disable(eap._lazy_disable),_dirty(eap._dirty), _enabled(eap._enabled),_normalized(eap._normalized),_pointer(eap._pointer) {} - EnabledArrayPair& operator = (const EnabledArrayPair& eap) { _lazy_disable = eap._lazy_disable;_dirty=eap._dirty; _enabled=eap._enabled; _normalized=eap._normalized;_pointer=eap._pointer; return *this; } - - bool _lazy_disable; - bool _dirty; - bool _enabled; - GLboolean _normalized; - const GLvoid* _pointer; - }; - - typedef std::vector EnabledTexCoordArrayList; - typedef std::vector EnabledVertexAttribArrayList; - - EnabledArrayPair _vertexArray; - EnabledArrayPair _normalArray; - EnabledArrayPair _colorArray; - EnabledArrayPair _secondaryColorArray; - EnabledArrayPair _fogArray; - EnabledTexCoordArrayList _texCoordArrayList; - EnabledVertexAttribArrayList _vertexAttribArrayList; - unsigned int _currentActiveTextureUnit; unsigned int _currentClientActiveTextureUnit; GLBufferObject* _currentVBO;