Added State::InhertanceMask.

Author: robertosfield

include/vsg/app/CommandGraph.h

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

include/vsg/vk/State.h

@@ -286,7 +286,16 @@ namespace vsg
 
         void reset();
 
-        void inherit(State& state);
+        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;
+        };
+
+        void inherit(State& state, InheritanceMask inheritanceMask = INHERIT_ALL);
 
         inline void dirtyStateStacks()
         {

src/vsg/app/RecordTraversal.cpp

@@ -670,15 +670,15 @@ void RecordTraversal::apply(const CommandGraph& commandGraph)
         auto cg = const_cast<CommandGraph*>(&commandGraph);
         if (cg->device)
         {
-#if 1
-            cg->getOrCreateRecordTraversal()->_state->inherit(*_state);
-#else
-            if (_viewDependentState && _viewDependentState->view && _viewDependentState->view->camera)
+
+            cg->getOrCreateRecordTraversal()->_state->inherit(*_state, cg->stateInheritanceMask);
+
+            if (_viewDependentState && _viewDependentState->view && (_viewDependentState->view->features & INHERIT_VIEWPOINT)!=0))
             {
                 auto camera = _viewDependentState->view->camera;
-                cg->getOrCreateRecordTraversal()->_state->setInhertiedViewProjectionAndViewMatrix(camera->projectionMatrix->transform(), camera->viewMatrix->transform());
+                if(camera) cg->getOrCreateRecordTraversal()->_state->setInhertiedViewProjectionAndViewMatrix(camera->projectionMatrix->transform(), camera->viewMatrix->transform());
             }
-#endif
+
 
             cg->record(recordedCommandBuffers, _frameStamp, _databasePager);
         }

src/vsg/vk/State.cpp

@@ -80,25 +80,37 @@ void State::popView(const View& view)
 
 void State::inherit(State& state)
 {
-    dirty = true;
-
-    _frustumUnit = state._frustumUnit;
-    _frustumProjected = state._frustumProjected;
-
-    _frustumStack = state._frustumStack;
-
-    inheritViewForLODScaling = state.inheritViewForLODScaling;
-    inheritedProjectionMatrix = state.inheritedProjectionMatrix;
-    inheritedViewMatrix = state.inheritedViewMatrix;
-    inheritedViewTransform = state.inheritedViewTransform;
+    reset();
 
+    dirty = true;
     maxSlots = state.maxSlots;
     activeMaxStateSlot = state.activeMaxStateSlot;
 
-    stateStacks = state.stateStacks;
+    if ((inheritMask & INHERIT_VIEWPOINT) !=0)
+    {
+        inheritViewForLODScaling = state.inheritViewForLODScaling;
+        inheritedProjectionMatrix = state.inheritedProjectionMatrix;
+        inheritedViewMatrix = state.inheritedViewMatrix;
+        inheritedViewTransform = state.inheritedViewTransform;
+    }
+
+    if ((inheritMask & INHERIT_STATE)!=0)
+    {
+        stateStacks = state.stateStacks;
+    }
+
+    if ((inheritMask & INHERIT_VIEWPORT_STATE_HINT)!=0)
+    {
+        viewportStateHint = state.viewportStateHint;
+    }
 
-    viewportStateHint = state.viewportStateHint;
+    if ((inheritMask & INHERIT_MATRICES)!=0)
+    {
+        projectionMatrixStack = state.projectionMatrixStack;
+        modelviewMatrixStack = state.modelviewMatrixStack;
 
-    projectionMatrixStack = state.projectionMatrixStack;
-    modelviewMatrixStack = state.modelviewMatrixStack;
+        _frustumUnit = state._frustumUnit;
+        _frustumProjected = state._frustumProjected;
+        _frustumStack = state._frustumStack;
+    }
 }