Mopved inihertance mask into vsg::State.

Author: robertosfield

include/vsg/app/CommandGraph.h

@@ -41,7 +41,6 @@ namespace vsg
         int presentFamily = -1;
         int submitOrder = 0;
         Slots maxSlots;
-        StateInheritanceMask stateInheritanceMask = StateInheritanceMask::INHERIT_ALL;
 
         ref_ptr<RecordTraversal> getOrCreateRecordTraversal();
 

include/vsg/vk/CommandBuffer.h

@@ -25,15 +25,6 @@ namespace vsg
     class InstanceNode;
     class State;
 
-    enum StateInheritanceMask : unsigned int
-    {
-        INHERIT_STATE = (1 << 0),
-        INHERIT_VIEWPORT_STATE_HINT = (1 << 1),
-        INHERIT_VIEWPOINTS = (1 << 2),
-        INHERIT_MATRICES = (1 << 4),
-        INHERIT_ALL = INHERIT_STATE | INHERIT_VIEWPORT_STATE_HINT | INHERIT_VIEWPOINTS | INHERIT_MATRICES
-    };
-
     /// CommandBuffer encapsulates VkCommandBuffer
     class VSG_DECLSPEC CommandBuffer : public Inherit<Object, CommandBuffer>
     {

include/vsg/vk/State.h

@@ -285,8 +285,18 @@ namespace vsg
 
         void reset();
 
+        enum InheritanceMask
+        {
+            INHERIT_STATE = (1 << 0),
+            INHERIT_VIEWPORT_STATE_HINT = (1 << 1),
+            INHERIT_VIEWPOINT = (1 << 2),
+            INHERIT_MATRICES = (1 << 4),
+            INHERIT_ALL = INHERIT_STATE | INHERIT_VIEWPORT_STATE_HINT | INHERIT_VIEWPOINT | INHERIT_MATRICES
+        };
+
+        InheritanceMask inheritanceMask = InheritanceMask::INHERIT_ALL;
 
-        void inherit(State& state, StateInheritanceMask inheritanceMask = StateInheritanceMask::INHERIT_ALL);
+        void inherit(State& state);
 
         inline void dirtyStateStacks()
         {

src/vsg/app/RecordTraversal.cpp

@@ -670,7 +670,7 @@ void RecordTraversal::apply(const CommandGraph& commandGraph)
         auto cg = const_cast<CommandGraph*>(&commandGraph);
         if (cg->device)
         {
-            cg->getOrCreateRecordTraversal()->_state->inherit(*_state, cg->stateInheritanceMask);
+            cg->getOrCreateRecordTraversal()->_state->inherit(*_state);
 
             if (_viewDependentState && _viewDependentState->view && (_viewDependentState->view->features & INHERIT_VIEWPOINT) != 0)
                 {

src/vsg/vk/State.cpp

@@ -78,33 +78,33 @@ void State::popView(const View& view)
     if ((viewportStateHint & DYNAMIC_VIEWPORTSTATE) && view.camera && view.camera->viewportState) popView(view.camera->viewportState);
 }
 
-void State::inherit(State& state, StateInheritanceMask inheritanceMask)
+void State::inherit(State& state)
 {
+    reserve(state.maxSlots);
+
     reset();
 
     dirty = true;
-    maxSlots = state.maxSlots;
-    activeMaxStateSlot = state.activeMaxStateSlot;
 
-    if ((inheritanceMask & StateInheritanceMask::INHERIT_VIEWPOINTS) != 0)
+    if ((inheritanceMask & InheritanceMask::INHERIT_VIEWPOINT) != 0)
     {
         inheritViewForLODScaling = state.inheritViewForLODScaling;
         inheritedProjectionMatrix = state.inheritedProjectionMatrix;
         inheritedViewMatrix = state.inheritedViewMatrix;
         inheritedViewTransform = state.inheritedViewTransform;
     }
 
-    if ((inheritanceMask & StateInheritanceMask::INHERIT_STATE) != 0)
+    if ((inheritanceMask & InheritanceMask::INHERIT_STATE) != 0)
     {
         stateStacks = state.stateStacks;
     }
 
-    if ((inheritanceMask & StateInheritanceMask::INHERIT_VIEWPORT_STATE_HINT) != 0)
+    if ((inheritanceMask & InheritanceMask::INHERIT_VIEWPORT_STATE_HINT) != 0)
     {
         viewportStateHint = state.viewportStateHint;
     }
 
-    if ((inheritanceMask & StateInheritanceMask::INHERIT_MATRICES) != 0)
+    if ((inheritanceMask & InheritanceMask::INHERIT_MATRICES) != 0)
     {
         projectionMatrixStack = state.projectionMatrixStack;
         modelviewMatrixStack = state.modelviewMatrixStack;