Refactored the State::stateStack so it handles both the view specific and general state stacks

Author: robertosfield

include/vsg/vk/State.h

@@ -226,7 +226,7 @@ namespace vsg
     class State : public Inherit<Object, State>
     {
     public:
-        explicit State(uint32_t maxStateSlot, uint32_t maxViewSlot);
+        explicit State(uint32_t in_maxStateSlot, uint32_t in_maxViewSlot);
 
         using StateCommandStack = StateStack<StateCommand>;
         using StateStacks = std::vector<StateCommandStack>;
@@ -246,15 +246,18 @@ namespace vsg
         dmat4 inheritedViewMatrix;
         dmat4 inheritedViewTransform;
 
+        uint32_t activeMaxStateSlot = 0;
+        uint32_t maxStateSlot = 0;
+        uint32_t maxViewSlot = 0;
+
         StateStacks stateStacks;
 
         uint32_t viewportStateHint = 0;
-        StateStacks viewStateStacks;
 
         MatrixStack projectionMatrixStack{0};
         MatrixStack modelviewMatrixStack{64};
 
-        void reserve(uint32_t maxStateSlot, uint32_t maxViewSlot);
+        void reserve(uint32_t in_maxStateSlot, uint32_t in_maxViewSlot);
 
         void reset();
 
@@ -290,11 +293,14 @@ namespace vsg
         {
             if (dirty)
             {
-                for (auto& stateStack : stateStacks)
+                for(uint32_t slot = 0; slot <= activeMaxStateSlot; ++slot)
                 {
-                    stateStack.record(*_commandBuffer);
+                    stateStacks[slot].record(*_commandBuffer);
                 }
 
+                // reset the active maxslot to the minimum required
+                activeMaxStateSlot = maxStateSlot;
+
                 projectionMatrixStack.record(*_commandBuffer);
                 modelviewMatrixStack.record(*_commandBuffer);
 
@@ -352,8 +358,6 @@ namespace vsg
 
         void popView(const View& view);
 
-        void recordView();
-
         inline void pushFrustum()
         {
             _frustumStack.push(Frustum(_frustumProjected, modelviewMatrixStack.top()));

src/vsg/state/ViewportState.cpp

@@ -18,6 +18,7 @@ using namespace vsg;
 
 ViewportState::ViewportState()
 {
+    slot = 8;
 }
 
 ViewportState::ViewportState(const ViewportState& vs) :
@@ -140,6 +141,7 @@ void ViewportState::apply(Context& context, VkGraphicsPipelineCreateInfo& pipeli
 
 void ViewportState::record(CommandBuffer& commandBuffer) const
 {
+//    info("ViewportState::record() ", &commandBuffer);
     vkCmdSetScissor(commandBuffer, 0, static_cast<uint32_t>(scissors.size()), scissors.data());
     vkCmdSetViewport(commandBuffer, 0, static_cast<uint32_t>(viewports.size()), viewports.data());
 }

src/vsg/vk/State.cpp

@@ -16,21 +16,22 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 using namespace vsg;
 
-State::State(uint32_t maxStateSlot, uint32_t maxViewSlot) :
+State::State(uint32_t in_maxStateSlot, uint32_t in_maxViewSlot) :
     dirty(false)
 {
-    reserve(maxStateSlot, maxViewSlot);
+    reserve(in_maxStateSlot, in_maxViewSlot);
 }
 
-void State::reserve(uint32_t maxStateSlot, uint32_t maxViewSlot)
+void State::reserve(uint32_t in_maxStateSlot, uint32_t in_maxViewSlot)
 {
-    //info("State::reserve(", maxStateSlot, ", ", maxViewSlot, ")");
+    maxStateSlot = in_maxStateSlot;
+    maxViewSlot = in_maxViewSlot;
+    activeMaxStateSlot = std::max(maxViewSlot, maxStateSlot);
 
-    size_t required_size = static_cast<size_t>(maxStateSlot) + 1;
+    size_t required_size = static_cast<size_t>(activeMaxStateSlot) + 1;
     if (required_size > stateStacks.size()) stateStacks.resize(required_size);
 
-    required_size = static_cast<size_t>(maxViewSlot) + 1;
-    if (required_size > viewStateStacks.size()) viewStateStacks.resize(required_size);
+//    info("State::reserve(", maxStateSlot, ", ", maxViewSlot, ")");
 }
 
 void State::reset()
@@ -41,22 +42,19 @@ void State::reset()
         stateStack.reset();
     }
 
-    for (auto& stateStack : viewStateStacks)
-    {
-        stateStack.reset();
-    }
+    activeMaxStateSlot = std::max(maxViewSlot, maxStateSlot);
 }
 
 void State::pushView(ref_ptr<StateCommand> command)
 {
-    viewStateStacks[command->slot].push(command);
-    recordView();
+    stateStacks[command->slot].push(command);
+    activeMaxStateSlot = std::max(maxViewSlot, maxStateSlot);
 }
 
 void State::popView(ref_ptr<StateCommand> command)
 {
-    viewStateStacks[command->slot].pop();
-    recordView();
+    stateStacks[command->slot].pop();
+    activeMaxStateSlot = std::max(maxViewSlot, maxStateSlot);
 }
 
 void State::pushView(const View& view)
@@ -70,13 +68,3 @@ 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::recordView()
-{
-    //info("State::recordView(..)");
-
-    for (auto& stateStack : viewStateStacks)
-    {
-        if (!stateStack.empty()) stateStack.record(*_commandBuffer);
-    }
-}