Refactored the VertexArrayState's handling of vertex attribute aliasing

2016-08-05 12:51:40 +01:00
parent 1f147f6bc6
commit bf28e2d037
7 changed files with 30 additions and 142 deletions
--- a/include/osg/VertexArrayState
+++ b/include/osg/VertexArrayState
@@ -25,7 +25,7 @@ class VertexArrayState : public osg::Referenced
 {
 public:

-        VertexArrayState(osg::GLExtensions* ext);
+        VertexArrayState(osg::State* state);

        struct ArrayDispatch : public osg::Referenced
        {
@@ -157,6 +157,7 @@ public:

        // osg::GLBufferObject* getGLBufferObject(osg::Array* array);

+        osg::State*                     _state;
        osg::ref_ptr<osg::GLExtensions> _ext;

        GLuint                          _vertexArrayObject;