Added clone to DescriptorConfigurator and ArrayConfigurator. Simplified ShaderSet::GeometryHints enum

Author: robertosfield

include/vsg/utils/GraphicsPipelineConfigurator.h

@@ -37,6 +37,9 @@ namespace vsg
     {
     public:
         explicit DescriptorConfigurator(ref_ptr<ShaderSet> in_shaderSet = {});
+        explicit DescriptorConfigurator(const DescriptorConfigurator& rhs, const CopyOp& copyop = {});
+
+        ref_ptr<Object> clone(const CopyOp& copyop = {}) const override { return DescriptorConfigurator::create(*this, copyop); }
 
         ref_ptr<ShaderSet> shaderSet;
         bool blending = false;
@@ -76,6 +79,9 @@ namespace vsg
     {
     public:
         explicit ArrayConfigurator(ref_ptr<ShaderSet> in_shaderSet = {});
+        explicit ArrayConfigurator(const ArrayConfigurator& rhs, const CopyOp& copyop = {});
+
+        ref_ptr<Object> clone(const CopyOp& copyop = {}) const override { return ArrayConfigurator::create(*this, copyop); }
 
         ref_ptr<ShaderSet> shaderSet;
 

include/vsg/utils/ShaderSet.h

@@ -129,7 +129,7 @@ namespace vsg
         std::vector<ref_ptr<CustomDescriptorSetBinding>> customDescriptorSetBindings;
 
         /// Hints mask for scene graph builders for what ShaderSet prefers/requires.
-        enum GeometryHints : uint32_t
+        enum GeometryHints
         {
             NO_PREFERENCE = 0,
             GEOMETRY = 1 << 0,
@@ -139,7 +139,7 @@ namespace vsg
             MESHLETS = 1 << 4
         };
 
-        uint32_t geometryHints = GeometryHints::NO_PREFERENCE;
+        int geometryHints = GeometryHints::NO_PREFERENCE;
 
         ref_ptr<ShaderCompileSettings> defaultShaderHints;
         /// variants of the rootShaderModule compiled for different combinations of ShaderCompileSettings

src/vsg/utils/GraphicsPipelineConfigurator.cpp

@@ -94,6 +94,17 @@ DescriptorConfigurator::DescriptorConfigurator(ref_ptr<ShaderSet> in_shaderSet)
 {
 }
 
+DescriptorConfigurator::DescriptorConfigurator(const DescriptorConfigurator& rhs, const CopyOp& copyop) :
+    Inherit(rhs, copyop),
+    shaderSet(rhs.shaderSet),
+    blending(rhs.blending),
+    two_sided(rhs.two_sided),
+    assigned(rhs.assigned),
+    defines(rhs.defines),
+    descriptorSets(rhs.descriptorSets)
+{
+}
+
 int DescriptorConfigurator::compare(const Object& rhs_object) const
 {
     int result = Object::compare(rhs_object);
@@ -339,6 +350,18 @@ ArrayConfigurator::ArrayConfigurator(ref_ptr<ShaderSet> in_shaderSet) :
 {
 }
 
+ArrayConfigurator::ArrayConfigurator(const ArrayConfigurator& rhs, const CopyOp& copyop) :
+    Inherit(rhs, copyop),
+    shaderSet(rhs.shaderSet),
+    baseAttributeBinding(rhs.baseAttributeBinding),
+    assigned(rhs.assigned),
+    defines(rhs.defines),
+    vertexBindingDescriptions(rhs.vertexBindingDescriptions),
+    vertexAttributeDescriptions(rhs.vertexAttributeDescriptions),
+    arrays(rhs.arrays)
+{
+}
+
 int ArrayConfigurator::compare(const Object& rhs_object) const
 {
     int result = Object::compare(rhs_object);

src/vsg/utils/ShaderSet.cpp

@@ -381,7 +381,7 @@ void ShaderSet::read(Input& input)
 
     if (input.version_greater_equal(1, 1, 16))
     {
-        input.readValue<uint32_t>("geometryHints", geometryHints);
+        input.readValue<int>("geometryHints", geometryHints);
     }
 }
 
@@ -459,7 +459,7 @@ void ShaderSet::write(Output& output) const
 
     if (output.version_greater_equal(1, 1, 16))
     {
-        output.writeValue<uint32_t>("geometryHints", geometryHints);
+        output.writeValue<int>("geometryHints", geometryHints);
     }
 }