Merge branch 'master' into HarmonySupport

Author: robertosfield

.github/workflows/ci-android.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        android-platform: [24, latest]
+        android-platform: [29, latest]
         android-abi: [armeabi-v7a, arm64-v8a]
         build-shared: [ON]
 

INSTALL.md

@@ -20,7 +20,7 @@
 
 * C++17 compliant compiler i.e. g++ 7.3 or later, Clang 6.0 or later, Visual Studio S2017 or later.
 * [Vulkan](https://vulkan.lunarg.com/) 1.1 or later.  You can use Vulkan (libs and headers) installed from repositories or VulkanSDK.
-* [CMake](https://www.cmake.org) 3.7 or later.
+* [CMake](https://www.cmake.org) 3.10 or later.
 
 ---
 
@@ -180,7 +180,7 @@ 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)
+	cmake_minimum_required(VERSION 3.10)
 	find_package(vsg REQUIRED)
 	add_executable(myapp "myapp.cpp")
 	target_link_libraries(myapp vsg::vsg)
@@ -191,7 +191,7 @@ The build system provides macros that create specific cmake targets to use in yo
 
 For example, a bare minimum CMakeLists.txt file adding the mentioned cmake targets would be:
 
-	cmake_minimum_required(VERSION 3.7)
+	cmake_minimum_required(VERSION 3.10)
 	find_package(vsg REQUIRED)
 
 	vsg_setup_dir_vars()

include/vsg/io/DatabasePager.h

@@ -48,6 +48,47 @@ namespace vsg
         std::vector<const PagedLOD*> newHighresRequired;
     };
 
+    struct PagedLODContainer : public Inherit<Object, PagedLODContainer>
+    {
+        explicit PagedLODContainer(uint32_t maxNumPagedLOD = 10000);
+
+        struct List
+        {
+            uint32_t head = 0;
+            uint32_t tail = 0;
+            uint32_t count = 0;
+            std::string name;
+        };
+
+        struct Element
+        {
+            uint32_t previous = 0;
+            uint32_t next = 0;
+            ref_ptr<PagedLOD> plod;
+            List* list = nullptr;
+        };
+
+        using Elements = std::vector<Element>;
+
+        Elements elements;
+        List availableList;
+        List inactiveList;
+        List activeList;
+
+        void resize(uint32_t new_size);
+        void resize();
+        void inactive(const PagedLOD* plod);
+        void active(const PagedLOD* plod);
+        void remove(PagedLOD* plod);
+
+        void _move(const PagedLOD* plod, List* targetList);
+
+        bool check();
+        bool check(const List& list);
+
+        void print(std::ostream& out);
+    };
+
     /// Thread safe queue for tracking PagedLOD that needs to be loaded, compiled or merged by the DatabasePager
     class VSG_DECLSPEC DatabaseQueue : public Inherit<Object, DatabaseQueue>
     {

include/vsg/io/convert_utf.h

@@ -28,10 +28,19 @@ namespace vsg
     inline void convert_utf(const std::string& src, std::string& dst) { dst = src; }
     inline void convert_utf(const std::wstring& src, std::wstring& dst) { dst = src; }
 
-    #if defined(__cpp_char8_t)
+#if defined(__cpp_char8_t)
     inline void convert_utf(const std::u8string& src, std::u8string& dst) { dst = src; }
-    inline void convert_utf(const std::wstring& src, std::u8string& dst) { std::string temp_dst; convert_utf(src, temp_dst); dst.assign(temp_dst.begin(), temp_dst.end()); }
-    inline void convert_utf(const std::u8string& src, std::wstring& dst) { std::string temp_src(src.begin(), src.end()); convert_utf(temp_src, dst); }
+    inline void convert_utf(const std::wstring& src, std::u8string& dst)
+    {
+        std::string temp_dst;
+        convert_utf(src, temp_dst);
+        dst.assign(temp_dst.begin(), temp_dst.end());
+    }
+    inline void convert_utf(const std::u8string& src, std::wstring& dst)
+    {
+        std::string temp_src(src.begin(), src.end());
+        convert_utf(temp_src, dst);
+    }
 
     inline void convert_utf(const char8_t c, std::u8string& dst)
     {
@@ -56,7 +65,7 @@ namespace vsg
         convert_utf(src, dst);
         return dst;
     }
-    #endif
+#endif
 
     inline void convert_utf(const char c, std::string& dst)
     {

include/vsg/nodes/PagedLOD.h

@@ -108,45 +108,4 @@ namespace vsg
     };
     VSG_type_name(vsg::PagedLOD);
 
-    struct PagedLODContainer : public Inherit<Object, PagedLODContainer>
-    {
-        explicit PagedLODContainer(uint32_t maxNumPagedLOD = 10000);
-
-        struct List
-        {
-            uint32_t head = 0;
-            uint32_t tail = 0;
-            uint32_t count = 0;
-            std::string name;
-        };
-
-        struct Element
-        {
-            uint32_t previous = 0;
-            uint32_t next = 0;
-            ref_ptr<PagedLOD> plod;
-            List* list = nullptr;
-        };
-
-        using Elements = std::vector<Element>;
-
-        Elements elements;
-        List availableList;
-        List inactiveList;
-        List activeList;
-
-        void resize(uint32_t new_size);
-        void resize();
-        void inactive(const PagedLOD* plod);
-        void active(const PagedLOD* plod);
-        void remove(PagedLOD* plod);
-
-        void _move(const PagedLOD* plod, List* targetList);
-
-        bool check();
-        bool check(const List& list);
-
-        void print(std::ostream& out);
-    };
-
 } // namespace vsg

include/vsg/vk/vulkan.h

@@ -116,6 +116,41 @@ typedef struct VkRenderPassCreateInfo2KHR
 
 #endif
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  Definitions not provided prior to 1.1.97
+//
+#if VK_HEADER_VERSION < 97
+
+#define VK_EXT_memory_budget 1
+#define VK_EXT_MEMORY_BUDGET_SPEC_VERSION 1
+#define VK_EXT_MEMORY_BUDGET_EXTENSION_NAME "VK_EXT_memory_budget"
+
+typedef struct VkPhysicalDeviceMemoryBudgetPropertiesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkDeviceSize       heapBudget[VK_MAX_MEMORY_HEAPS];
+    VkDeviceSize       heapUsage[VK_MAX_MEMORY_HEAPS];
+} VkPhysicalDeviceMemoryBudgetPropertiesEXT;
+
+#define VK_EXT_memory_priority 1
+#define VK_EXT_MEMORY_PRIORITY_SPEC_VERSION 1
+#define VK_EXT_MEMORY_PRIORITY_EXTENSION_NAME "VK_EXT_memory_priority"
+
+typedef struct VkPhysicalDeviceMemoryPriorityFeaturesEXT {
+    VkStructureType    sType;
+    void*              pNext;
+    VkBool32           memoryPriority;
+} VkPhysicalDeviceMemoryPriorityFeaturesEXT;
+
+typedef struct VkMemoryPriorityAllocateInfoEXT {
+    VkStructureType    sType;
+    const void*        pNext;
+    float              priority;
+} VkMemoryPriorityAllocateInfoEXT;
+
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
 //  Definitions not provided prior to 1.3.215