Added State::inherit(..) method.

Author: robertosfield

include/vsg/vk/State.h

@@ -39,6 +39,15 @@ namespace vsg
         Stack stack;
         size_t pos = 0;
 
+        StateStack& operator = (const StateStack& rhs)
+        {
+            stack = rhs.stack;
+            pos = rhs.pos;
+            dirty();
+
+            return *this;
+        }
+
         inline void reset()
         {
             pos = 0;
@@ -93,6 +102,15 @@ namespace vsg
         uint32_t offset = 0;
         bool dirty = false;
 
+        MatrixStack& operator = (const MatrixStack& rhs)
+        {
+            matrixStack = rhs.matrixStack;
+            offset = rhs.offset;
+            dirty = true;
+
+            return *this;
+        }
+
         inline void set(const mat4& matrix)
         {
             matrixStack = {};
@@ -150,6 +168,7 @@ namespace vsg
                     return;
                 }
 
+
                 // make sure matrix is a float matrix.
                 mat4 newmatrix(matrixStack.top());
                 vkCmdPushConstants(commandBuffer, pipeline, stageFlags, offset, sizeof(newmatrix), newmatrix.data());
@@ -267,8 +286,11 @@ namespace vsg
 
         void reset();
 
+        void inherit(State& state);
+
         inline void dirtyStateStacks()
         {
+            dirty = true;
             for (auto& stateStack : stateStacks)
             {
                 stateStack.dirty();
@@ -307,6 +329,7 @@ namespace vsg
         {
             if (dirty)
             {
+
                 for (uint32_t slot = 0; slot <= activeMaxStateSlot; ++slot)
                 {
                     stateStacks[slot].record(*_commandBuffer);

src/vsg/app/RecordTraversal.cpp

@@ -670,11 +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)
             {
                 auto camera = _viewDependentState->view->camera;
                 cg->getOrCreateRecordTraversal()->_state->setInhertiedViewProjectionAndViewMatrix(camera->projectionMatrix->transform(), camera->viewMatrix->transform());
             }
+#endif
 
             cg->record(recordedCommandBuffers, _frameStamp, _databasePager);
         }

src/vsg/vk/State.cpp

@@ -35,7 +35,6 @@ void State::reserve(const Slots& in_maxSlots)
 
 void State::reset()
 {
-    //info("State::reset()");
     for (auto& stateStack : stateStacks)
     {
         stateStack.reset();
@@ -48,7 +47,11 @@ void State::connect(ref_ptr<CommandBuffer> commandBuffer)
 {
     _commandBuffer = commandBuffer;
     commandBuffer->state = this;
+#if 0
     reset();
+#else
+    dirtyStateStacks();
+#endif
 }
 
 void State::pushView(ref_ptr<StateCommand> command)
@@ -74,3 +77,28 @@ void State::popView(const View& view)
     //info("State::popView(View&, ", &view, ")");
     if ((viewportStateHint & DYNAMIC_VIEWPORTSTATE) && view.camera && view.camera->viewportState) popView(view.camera->viewportState);
 }
+
+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;
+
+    maxSlots = state.maxSlots;
+    activeMaxStateSlot = state.activeMaxStateSlot;
+
+    stateStacks = state.stateStacks;
+
+    viewportStateHint = state.viewportStateHint;
+
+    projectionMatrixStack = state.projectionMatrixStack;
+    modelviewMatrixStack = state.modelviewMatrixStack;
+}