Merge branch 'master' into AnyOldName3-fix-semaphore-reuse

Author: robertosfield

.github/workflows/ci.yml

@@ -10,12 +10,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        vulkan-version: [1.3.250.1]
+        vulkan-version: [1.3.268.0]
         build-shared: [OFF]
         include:
           - build-shared: ON
             os: windows-latest
-            vulkan-version: 1.3.250.1
+            vulkan-version: 1.3.268.0
     continue-on-error: ${{ matrix.vulkan-version == 'latest' }}
 
     steps:

CMakeLists.txt

@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.10)
 
 project(vsg
-    VERSION 1.1.11
+    VERSION 1.1.13
     DESCRIPTION "VulkanSceneGraph library"
     LANGUAGES CXX
 )
-set(VSG_SOVERSION 14)
+set(VSG_SOVERSION 15)
 SET(VSG_RELEASE_CANDIDATE 0)
 set(Vulkan_MIN_VERSION 1.1.70.0)
 
@@ -41,21 +41,13 @@ find_package(Threads REQUIRED)
 set(VSG_MAX_INSTRUMENTATION_LEVEL 1 CACHE STRING "Set the instrumentation level to build into the VSG library, 0 for off, 1 coarse grained, 2 medium, 3 fine grained." )
 
 # Enable/disable shader compilation support that pulls in glslang
-set(VSG_SUPPORTS_ShaderCompiler  1 CACHE STRING "Optional shader compiler support, 0 for off, 1 for enabled." )
+option(VSG_SUPPORTS_ShaderCompiler "Optional shader compiler support" ON)
 if (VSG_SUPPORTS_ShaderCompiler)
 
-    # Try looking for glslang 15 first.
-    set(GLSLANG_MIN_VERSION "15" CACHE STRING "glslang 14 is the earliest version that we think installs itself properly on all platforms. Other platforms may be able to use an earlier version")
-    find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG QUIET)
-
-    if (NOT glslang_FOUND)
-        # fallback to trying glslang 14.
-        set(GLSLANG_MIN_VERSION "14")
-        find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG)
-    endif()
+    find_package(glslang CONFIG QUIET)
 
     if (glslang_FOUND)
-        set(FIND_DEPENDENCY_glslang "find_package(glslang ${GLSLANG_MIN_VERSION} CONFIG REQUIRED)")
+        set(FIND_DEPENDENCY_glslang "find_package(glslang CONFIG REQUIRED)")
     else()
         message(WARNING "glslang not found. ShaderCompile support disabled.")
         set(VSG_SUPPORTS_ShaderCompiler 0)
@@ -75,7 +67,7 @@ if (VSG_SUPPORTS_ShaderCompiler)
     endif()
 endif()
 
-set(VSG_SUPPORTS_Windowing  1 CACHE STRING "Optional native windowing support providing a default implementation of vsg::Window::create(), 0 for off, 1 for enabled." )
+option(VSG_SUPPORTS_Windowing "Optional native windowing support providing a default implementation of vsg::Window::create()" ON)
 if (VSG_SUPPORTS_Windowing)
     if (ANDROID)
         set(FIND_DEPENDENCY_WINDOWING "")
@@ -98,6 +90,8 @@ if (VSG_SUPPORTS_Windowing)
     endif()
 endif()
 
+option(VSG_USE_dynamic_cast "Use dynamic_cast in vsg::Object::cast<T>(), 0 for off, 1 for enabled." OFF)
+
 # this line needs to be after the call to setup_build_vars()
 configure_file("${VSG_SOURCE_DIR}/src/vsg/core/Version.h.in" "${VSG_VERSION_HEADER}")
 

INSTALL.md

@@ -170,22 +170,19 @@ To assist with setting up software to work with the VSG when you install the lib
 
 	find_package(vsg)
 
-To select C++17 compilation you'll need:
-
-	set_property(TARGET mytargetname PROPERTY CXX_STANDARD 17)
-
 To link your lib/application to required dependencies you'll need:
 
 	target_link_libraries(mytargetname vsg::vsg)
 
 This will tell CMake to set up all the appropriate include paths, libs and any definitions (such as the VSG_SHARED_LIBRARY #define that is required under Windows with shared library builds to select the correct declspec().)
 
+This will also tell CMake that your minimum C++ standard is 17.
+
 For example, a bare minimum CMakeLists.txt file to compile a single file application would be:
 
 	cmake_minimum_required(VERSION 3.7)
 	find_package(vsg REQUIRED)
 	add_executable(myapp "myapp.cpp")
-	set_property(TARGET myapp PROPERTY CXX_STANDARD 17)
 	target_link_libraries(myapp vsg::vsg)
 
 ### Using VSG provided cmake macros within your own projects
@@ -218,7 +215,6 @@ For example, a bare minimum CMakeLists.txt file adding the mentioned cmake targe
 	vsg_add_target_uninstall()
 
 	add_executable(myapp "myapp.cpp")
-	set_property(TARGET myapp PROPERTY CXX_STANDARD 17)
 	target_link_libraries(myapp vsg::vsg)
 
 ### Using VSG provided cmake macro to generate cmake support files

README.md

@@ -45,7 +45,7 @@ Community projects:
 
 The above dependency versions are known to work so they've been set as the current minimum, it may be possible to build against older versions.  If you find success with older versions let us know and we can update the version info.
 
-While you can install Vulkan and glslang development libraries and headers from 3rd party repositoriesm these may be older, so for the latest versions you can also use the VulkanSDK provided by LunarG.  Your can download VulkanSDK from [LunarG](https://vulkan.lunarg.com/sdk/home), unpack into a local directory and set VULKAN_SDK environment variable to the include/lib directory within it.
+While you can install Vulkan and glslang development libraries and headers from 3rd party repositories, these may be older, so for the latest versions you can also use the VulkanSDK provided by LunarG.  You can download VulkanSDK from [LunarG](https://vulkan.lunarg.com/sdk/home), unpack into a local directory and set VULKAN_SDK environment variable to the include/lib directory within it.
 
 ### Command line build instructions:
 

include/vsg/all.h

@@ -27,6 +27,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/core/IntrusiveAllocator.h>
 #include <vsg/core/Mask.h>
 #include <vsg/core/MemorySlots.h>
+#include <vsg/core/MipmapLayout.h>
 #include <vsg/core/Object.h>
 #include <vsg/core/Objects.h>
 #include <vsg/core/ScratchMemory.h>

include/vsg/app/RecordTraversal.h

@@ -99,7 +99,7 @@ namespace vsg
         ref_ptr<RecordedCommandBuffers> recordedCommandBuffers;
 
         /// get the current State object used to track state and projection/modelview matrices for the current subgraph being traversed
-        State* getState() { return _state; }
+        State* getState() { return state; }
 
         /// get the current CommandBuffer for the current subgraph being traversed
         CommandBuffer* getCommandBuffer();
@@ -108,10 +108,10 @@ namespace vsg
         uint32_t deviceID() const;
 
         void setFrameStamp(FrameStamp* fs);
-        FrameStamp* getFrameStamp() { return _frameStamp; }
+        FrameStamp* getFrameStamp() { return frameStamp; }
 
         void setDatabasePager(DatabasePager* dp);
-        DatabasePager* getDatabasePager() { return _databasePager; }
+        DatabasePager* getDatabasePager() { return databasePager; }
 
         void apply(const Object& object);
 
@@ -173,19 +173,19 @@ namespace vsg
         // list of pairs of modelview matrix & region of interest
         std::vector<std::pair<dmat4, const RegionOfInterest*>> regionsOfInterest;
 
-    protected:
-        virtual ~RecordTraversal();
-
-        ref_ptr<FrameStamp> _frameStamp;
-        ref_ptr<State> _state;
+        ref_ptr<FrameStamp> frameStamp;
+        ref_ptr<State> state;
 
         // used to handle loading of PagedLOD external children.
-        ref_ptr<DatabasePager> _databasePager;
-        ref_ptr<CulledPagedLODs> _culledPagedLODs;
+        ref_ptr<DatabasePager> databasePager;
+        ref_ptr<CulledPagedLODs> culledPagedLODs;
 
-        int32_t _minimumBinNumber = 0;
-        std::vector<ref_ptr<Bin>> _bins;
-        ref_ptr<ViewDependentState> _viewDependentState;
+        int32_t minimumBinNumber = 0;
+        std::vector<ref_ptr<Bin>> bins;
+        ref_ptr<ViewDependentState> viewDependentState;
+
+    protected:
+        virtual ~RecordTraversal();
     };
 
 } // namespace vsg

include/vsg/app/TransferTask.h

@@ -118,4 +118,7 @@ namespace vsg
     };
     VSG_type_name(vsg::TransferTask);
 
+    /// convenience function that uploads staging buffer data to device including mipmaps.
+    extern VSG_DECLSPEC void transferImageData(ref_ptr<ImageView> imageView, VkImageLayout targetImageLayout, Data::Properties properties, uint32_t width, uint32_t height, uint32_t depth, uint32_t mipLevels, ref_ptr<Buffer> stagingBuffer, VkDeviceSize stagingBufferOffset, VkCommandBuffer vk_commandBuffer, vsg::Device* device);
+
 } // namespace vsg

include/vsg/app/View.h

@@ -77,6 +77,9 @@ namespace vsg
         /// and when it is visited the visitor.traversalMask is &'ed with the mask to give the traversalMask to use in the subgraph.
         Mask mask = MASK_ALL;
 
+        /// LODScale scales
+        double LODScale = 1.0;
+
         /// bins
         std::vector<ref_ptr<Bin>> bins;
 

include/vsg/app/WindowTraits.h

@@ -70,7 +70,7 @@ namespace vsg
         VkImageUsageFlags depthImageUsage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
 
         VkQueueFlags queueFlags = VK_QUEUE_GRAPHICS_BIT;
-        std::vector<float> queuePiorities{1.0, 0.0};
+        std::vector<float> queuePriorities{1.0, 0.0};
         VkPipelineStageFlagBits imageAvailableSemaphoreWaitFlag = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 
         // hints to which extension to enable during Instance/Device setup

include/vsg/commands/CopyAndReleaseImage.h

@@ -40,7 +40,6 @@ namespace vsg
             uint32_t width = 0;
             uint32_t height = 0;
             uint32_t depth = 0;
-            Data::MipmapOffsets mipmapOffsets;
 
             void record(CommandBuffer& commandBuffer) const;
         };