Merge branch 'master' into DatabasePagerLoadBalancing

Author: robertosfield

.github/workflows/ci.yml

@@ -9,19 +9,21 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        vulkan-version: [1.3.268.0]
+        # os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
+        vulkan-version: [1.4.341.1]
         build-shared: [OFF]
-        include:
-          - build-shared: ON
-            os: windows-latest
-            vulkan-version: 1.3.268.0
+        # include:
+        #   - build-shared: ON
+        #     os: windows-latest
+        #     vulkan-version: 1.4.341.1
+
     continue-on-error: ${{ matrix.vulkan-version == 'latest' }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.12
+      uses: jwlawson/actions-setup-cmake@v2.2.0
       with:
         cmake-version: ${{ env.CMakeVersion }}
     - name: Install Vulkan SDK
@@ -30,7 +32,7 @@ jobs:
         version: ${{ matrix.vulkan-version }}
         cache: true
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v3
       if: startsWith(matrix.os, 'windows')
     - name: Build and Install VSG
       shell: bash

include/vsg/core/Exception.h

@@ -12,14 +12,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 </editor-fold> */
 
+#include <vsg/core/Export.h>
+
 #include <string>
 
 namespace vsg
 {
 
     /// Exception object that can be thrown from VSG code, such as failed Vulkan calls where the result value will be the VkResult value
     /// returned from failed Vulkan call.
-    struct Exception
+    struct VSG_DECLSPEC Exception
     {
         std::string message;
         int result = 0;

include/vsg/core/MemorySlots.h

@@ -32,7 +32,7 @@ namespace vsg
     };
 
     // forward declare
-    class LogOutput;
+    struct LogOutput;
 
     /** class used internally by vsg::Allocator, vsg::DeviceMemory and vsg::Buffer to manage suballocation within a block of CPU or GPU memory.*/
     class VSG_DECLSPEC MemorySlots

include/vsg/utils/Instrumentation.h

@@ -54,21 +54,21 @@ namespace vsg
 
         virtual ref_ptr<Instrumentation> shareOrDuplicateForThreadSafety() { return ref_ptr<Instrumentation>(this); }
 
-        virtual void setThreadName(const std::string& /*name*/) const {};
+        virtual void setThreadName(const std::string& /*name*/) const {}
 
-        virtual void enterFrame(const SourceLocation* /*sl*/, uint64_t& /*reference*/, FrameStamp& /*frameStamp*/) const {};
-        virtual void leaveFrame(const SourceLocation* /*sl*/, uint64_t& /*reference*/, FrameStamp& /*frameStamp*/) const {};
+        virtual void enterFrame(const SourceLocation* /*sl*/, uint64_t& /*reference*/, FrameStamp& /*frameStamp*/) const {}
+        virtual void leaveFrame(const SourceLocation* /*sl*/, uint64_t& /*reference*/, FrameStamp& /*frameStamp*/) const {}
 
-        virtual void enter(const SourceLocation* /*sl*/, uint64_t& /*reference*/, const Object* /*object*/ = nullptr) const {};
-        virtual void leave(const SourceLocation* /*sl*/, uint64_t& /*reference*/, const Object* /*object*/ = nullptr) const {};
+        virtual void enter(const SourceLocation* /*sl*/, uint64_t& /*reference*/, const Object* /*object*/ = nullptr) const {}
+        virtual void leave(const SourceLocation* /*sl*/, uint64_t& /*reference*/, const Object* /*object*/ = nullptr) const {}
 
-        virtual void enterCommandBuffer(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/) const {};
-        virtual void leaveCommandBuffer(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/) const {};
+        virtual void enterCommandBuffer(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/) const {}
+        virtual void leaveCommandBuffer(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/) const {}
 
-        virtual void enter(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/, const Object* /*object*/ = nullptr) const {};
-        virtual void leave(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/, const Object* /*object*/ = nullptr) const {};
+        virtual void enter(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/, const Object* /*object*/ = nullptr) const {}
+        virtual void leave(const SourceLocation* /*sl*/, uint64_t& /*reference*/, CommandBuffer& /*commandBuffer*/, const Object* /*object*/ = nullptr) const {}
 
-        virtual void finish() const {};
+        virtual void finish() const {}
 
     protected:
         virtual ~Instrumentation();

src/vsg/vk/Device.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 using namespace vsg;
 
-// thread safe container for managing the deviceID for each vsg;:Device
+// thread safe container for managing the deviceID for each vsg::Device
 static std::mutex s_DeviceCountMutex;
 static std::vector<bool> s_ActiveDevices;