Fixed build by reorganizing where mask is defined.

Author: robertosfield

include/vsg/app/CommandGraph.h

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

include/vsg/vk/CommandBuffer.h

@@ -25,6 +25,15 @@ 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

@@ -39,7 +39,7 @@ namespace vsg
         Stack stack;
         size_t pos = 0;
 
-        StateStack& operator = (const StateStack& rhs)
+        StateStack& operator=(const StateStack& rhs)
         {
             stack = rhs.stack;
             pos = rhs.pos;
@@ -102,7 +102,7 @@ namespace vsg
         uint32_t offset = 0;
         bool dirty = false;
 
-        MatrixStack& operator = (const MatrixStack& rhs)
+        MatrixStack& operator=(const MatrixStack& rhs)
         {
             matrixStack = rhs.matrixStack;
             offset = rhs.offset;
@@ -168,7 +168,6 @@ namespace vsg
                     return;
                 }
 
-
                 // make sure matrix is a float matrix.
                 mat4 newmatrix(matrixStack.top());
                 vkCmdPushConstants(commandBuffer, pipeline, stageFlags, offset, sizeof(newmatrix), newmatrix.data());
@@ -286,16 +285,8 @@ 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;
-        };
 
-        void inherit(State& state, InheritanceMask inheritanceMask = INHERIT_ALL);
+        void inherit(State& state, StateInheritanceMask inheritanceMask = StateInheritanceMask::INHERIT_ALL);
 
         inline void dirtyStateStacks()
         {

src/vsg/app/RecordTraversal.cpp

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

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)
+void State::inherit(State& state, StateInheritanceMask inheritanceMask)
 {
     reset();
 
     dirty = true;
     maxSlots = state.maxSlots;
     activeMaxStateSlot = state.activeMaxStateSlot;
 
-    if ((inheritMask & INHERIT_VIEWPOINT) !=0)
+    if ((inheritanceMask & StateInheritanceMask::INHERIT_VIEWPOINTS) != 0)
     {
         inheritViewForLODScaling = state.inheritViewForLODScaling;
         inheritedProjectionMatrix = state.inheritedProjectionMatrix;
         inheritedViewMatrix = state.inheritedViewMatrix;
         inheritedViewTransform = state.inheritedViewTransform;
     }
 
-    if ((inheritMask & INHERIT_STATE)!=0)
+    if ((inheritanceMask & StateInheritanceMask::INHERIT_STATE) != 0)
     {
         stateStacks = state.stateStacks;
     }
 
-    if ((inheritMask & INHERIT_VIEWPORT_STATE_HINT)!=0)
+    if ((inheritanceMask & StateInheritanceMask::INHERIT_VIEWPORT_STATE_HINT) != 0)
     {
         viewportStateHint = state.viewportStateHint;
     }
 
-    if ((inheritMask & INHERIT_MATRICES)!=0)
+    if ((inheritanceMask & StateInheritanceMask::INHERIT_MATRICES) != 0)
     {
         projectionMatrixStack = state.projectionMatrixStack;
         modelviewMatrixStack = state.modelviewMatrixStack;