Merge branch 'master' into fast-intersection-queries

Author: robertosfield

CMakeLists.txt

@@ -98,6 +98,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}")
 

include/vsg/core/Array.h

@@ -32,7 +32,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class Array : public Data
+    class VSG_DECLSPEC Array : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Array2D.h

@@ -30,7 +30,7 @@ namespace vsg
 {
 
     template<typename T>
-    class Array2D : public Data
+    class VSG_DECLSPEC Array2D : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Array3D.h

@@ -30,7 +30,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class Array3D : public Data
+    class VSG_DECLSPEC Array3D : public Data
     {
     public:
         using value_type = T;

include/vsg/core/Export.h

@@ -25,5 +25,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #        define VSG_DECLSPEC
 #    endif
 #else
-#    define VSG_DECLSPEC
+#    if defined(VSG_SHARED_LIBRARY) || defined(VSG_EXPORTS)
+#        define VSG_DECLSPEC __attribute__((visibility("default")))
+#    else
+#        define VSG_DECLSPEC
+#    endif
 #endif

include/vsg/core/Object.h

@@ -18,7 +18,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <typeindex>
 #include <vector>
 
-#include <vsg/core/Export.h>
+#include <vsg/core/Version.h>
 #include <vsg/core/ref_ptr.h>
 #include <vsg/core/type_name.h>
 
@@ -85,11 +85,19 @@ namespace vsg
         virtual const std::type_info& type_info() const noexcept { return typeid(Object); }
         virtual bool is_compatible(const std::type_info& type) const noexcept { return typeid(Object) == type; }
 
+#if VSG_USE_dynamic_cast
+        template<class T>
+        T* cast() { return dynamic_cast<T*>(this); }
+
+        template<class T>
+        const T* cast() const { return dynamic_cast<const T*>(this); }
+#else
         template<class T>
         T* cast() { return is_compatible(typeid(T)) ? static_cast<T*>(this) : nullptr; }
 
         template<class T>
         const T* cast() const { return is_compatible(typeid(T)) ? static_cast<const T*>(this) : nullptr; }
+#endif
 
         /// clone this object using CopyOp's duplicates map to decide whether to clone or to return the original object.
         /// The default clone(CopyOp&) implementation simply returns ref_ptr<> to this object rather attempt to clone.

include/vsg/core/Value.h

@@ -36,7 +36,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 namespace vsg
 {
     template<typename T>
-    class Value : public Data
+    class VSG_DECLSPEC Value : public Data
     {
     public:
         using value_type = T;

include/vsg/state/DescriptorSetLayout.h

@@ -21,6 +21,7 @@ namespace vsg
     class Context;
 
     using DescriptorSetLayoutBindings = std::vector<VkDescriptorSetLayoutBinding>;
+    using DescriptorSetLayoutBindingFlags = std::vector<VkDescriptorBindingFlags>;
     using DescriptorPoolSizes = std::vector<VkDescriptorPoolSize>;
 
     /// DescriptorSetLayout encapsulates VkDescriptorSetLayout and VkDescriptorSetLayoutCreateInfo settings used to set it up.
@@ -34,9 +35,17 @@ namespace vsg
         /// Vulkan VkDescriptorSetLayout handle
         virtual VkDescriptorSetLayout vk(uint32_t deviceID) const { return _implementation[deviceID]->_descriptorSetLayout; }
 
+        /// VkDescriptorSetLayoutCreateFlags flags
+        VkDescriptorSetLayoutCreateFlags createFlags = 0;
+
         /// VkDescriptorSetLayoutCreateInfo settings
         DescriptorSetLayoutBindings bindings;
 
+        /// VkDescriptorSetLayoutBindingFlagsCreateInfo settings
+        DescriptorSetLayoutBindingFlags bindingFlags;
+
+        void addBinding(uint32_t binding, VkDescriptorType descriptorType, uint32_t descriptorCount, VkShaderStageFlags stageFlags, VkDescriptorBindingFlags flags = 0);
+
         /// map the descriptor bindings to the descriptor pool sizes that will be required to represent them.
         void getDescriptorPoolSizes(DescriptorPoolSizes& descriptorPoolSizes);
 
@@ -59,7 +68,7 @@ namespace vsg
 
         struct Implementation : public Inherit<Object, Implementation>
         {
-            Implementation(Device* device, const DescriptorSetLayoutBindings& descriptorSetLayoutBindings);
+            Implementation(Device* device, VkDescriptorSetLayoutCreateFlags createFlags, const DescriptorSetLayoutBindings& descriptorSetLayoutBindings, const DescriptorSetLayoutBindingFlags& descriptorSetLayoutBindingFlags);
 
             virtual ~Implementation();
 

include/vsg/utils/ComputeBounds.h

@@ -71,7 +71,7 @@ namespace vsg
         void apply(const uintArray& array) override;
 
         virtual void applyDraw(uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount);
-        virtual void applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, uint32_t firstInstance, uint32_t instanceCount);
+        virtual void applyDrawIndexed(uint32_t firstIndex, uint32_t indexCount, uint32_t firstInstance, uint32_t vertexOffset, uint32_t instanceCount);
 
         void add(const dbox& bb);
         void add(const dsphere& bs);

include/vsg/vk/SubmitCommands.h

@@ -29,7 +29,7 @@ namespace vsg
         VkResult result = VK_SUCCESS;
 
         auto commandBuffer = commandPool->allocate();
-        auto state = State::create(Slots{4,4});
+        auto state = State::create(Slots{4, 4});
         state->connect(commandBuffer);
 
         VkCommandBufferBeginInfo beginInfo = {};