Removed unneccessary vsg:: and added include

vsg-dev · Sep 13, 2023 · 3c8ffdf · 3c8ffdf
1 parent 9ca066f
commit 3c8ffdf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/include/vsg/app/WindowResizeHandler.h b/include/vsg/app/WindowResizeHandler.h
@@ -23,22 +23,22 @@ namespace vsg
 
     /// Utility class for updating a scene graph when a View's camera ViewportState has been updated so that associated GraphicsPipelines in the
     /// scene graph can be recompiled and correctly reflect the new ViewportState.
-    class VSG_DECLSPEC UpdateGraphicsPipelines : public vsg::Inherit<vsg::Visitor, UpdateGraphicsPipelines>
+    class VSG_DECLSPEC UpdateGraphicsPipelines : public Inherit<Visitor, UpdateGraphicsPipelines>
     {
     public:
         UpdateGraphicsPipelines();
 
-        vsg::ref_ptr<vsg::Context> context;
-        std::set<std::pair<const vsg::Object*, uint32_t>> visited;
+        ref_ptr<Context> context;
+        std::set<std::pair<const Object*, uint32_t>> visited;
 
         bool visit(const Object* object, uint32_t index);
 
-        void apply(vsg::Object& object) override;
-        void apply(vsg::BindGraphicsPipeline& bindPipeline) override;
-        void apply(vsg::StateGroup& sg) override;
-        void apply(vsg::View& view) override;
+        void apply(Object& object) override;
+        void apply(BindGraphicsPipeline& bindPipeline) override;
+        void apply(StateGroup& sg) override;
+        void apply(View& view) override;
     };
-    VSG_type_name(vsg::UpdateGraphicsPipelines);
+    VSG_type_name(UpdateGraphicsPipelines);
 
     /// WindowResizeHandler class for updating viewport/scissor and attachments to fit with new window dimensions.
     class VSG_DECLSPEC WindowResizeHandler : public Inherit<Visitor, WindowResizeHandler>
@@ -70,6 +70,6 @@ namespace vsg
         void apply(ClearAttachments& clearAttachments) override;
         void apply(View& view) override;
     };
-    VSG_type_name(vsg::WindowResizeHandler);
+    VSG_type_name(WindowResizeHandler);
 
 } // namespace vsg
diff --git a/include/vsg/state/Sampler.h b/include/vsg/state/Sampler.h
@@ -17,6 +17,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 namespace vsg
 {
+    // forward declare
     class Context;
 
     /// Sampler encapsulates the VkSampler and the VkSamplerCreateInfo settings used to set it up.

diff --git a/src/vsg/vk/ResourceRequirements.cpp b/src/vsg/vk/ResourceRequirements.cpp
@@ -24,6 +24,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/state/DescriptorImage.h>
 #include <vsg/state/MultisampleState.h>
 #include <vsg/state/ViewDependentState.h>
+#include <vsg/vk/Context.h>
 #include <vsg/vk/RenderPass.h>
 #include <vsg/vk/ResourceRequirements.h>