Merge pull request #1573 from vsg-dev/Shader_clone

Added copyop support to ShaderStage, ShaderModule and ShaderCompileSettings.

Author: robertosfield

include/vsg/state/ShaderModule.h

@@ -27,6 +27,10 @@ namespace vsg
     class VSG_DECLSPEC ShaderCompileSettings : public Inherit<Object, ShaderCompileSettings>
     {
     public:
+
+        ShaderCompileSettings();
+        ShaderCompileSettings(const ShaderCompileSettings& rhs, const CopyOp& copyop = {});
+
         enum Language
         {
             GLSL,
@@ -55,6 +59,7 @@ namespace vsg
         std::set<std::string> defines;
 
     public:
+        ref_ptr<Object> clone(const CopyOp& copyop = {}) const override { return ShaderCompileSettings::create(*this, copyop); }
         int compare(const Object& rhs_object) const override;
 
         void read(Input& input) override;
@@ -70,6 +75,7 @@ namespace vsg
         using SPIRV = std::vector<uint32_t>;
 
         ShaderModule();
+        ShaderModule(const ShaderModule& rhs, const CopyOp& copyop = {});
         explicit ShaderModule(const std::string& in_source, ref_ptr<ShaderCompileSettings> in_hints = {});
         explicit ShaderModule(const SPIRV& in_code);
         ShaderModule(const std::string& source, const SPIRV& in_code);
@@ -91,6 +97,7 @@ namespace vsg
         void release() { _implementation.clear(); }
 
     public:
+        ref_ptr<Object> clone(const CopyOp& copyop = {}) const override { return ShaderModule::create(*this, copyop); }
         int compare(const Object& rhs_object) const override;
 
         void read(Input& input) override;

include/vsg/state/ShaderStage.h

@@ -24,6 +24,7 @@ namespace vsg
     {
     public:
         ShaderStage();
+        ShaderStage(const ShaderStage& rhs, const CopyOp& copyop = {});
         ShaderStage(VkShaderStageFlagBits stage, const std::string& entryPointName, ref_ptr<ShaderModule> shaderModule);
         ShaderStage(VkShaderStageFlagBits stage, const std::string& entryPointName, const std::string& source, ref_ptr<ShaderCompileSettings> hints = {});
         ShaderStage(VkShaderStageFlagBits stage, const std::string& entryPointName, const ShaderModule::SPIRV& spirv);
@@ -44,16 +45,18 @@ namespace vsg
         static ref_ptr<ShaderStage> read(VkShaderStageFlagBits stage, const std::string& entryPointName, const Path& filename, ref_ptr<const Options> options = {});
         static ref_ptr<ShaderStage> read(VkShaderStageFlagBits stage, const std::string& entryPointName, std::istream& fin, ref_ptr<const Options> options = {});
 
-        int compare(const Object& rhs_object) const override;
-
-        void read(Input& input) override;
-        void write(Output& output) const override;
-
         void apply(Context& context, VkPipelineShaderStageCreateInfo& stageInfo) const;
 
         // compile the Vulkan object, context parameter used for Device
         void compile(Context& context);
 
+    public:
+        ref_ptr<Object> clone(const CopyOp& copyop = {}) const override { return ShaderStage::create(*this, copyop); }
+        int compare(const Object& rhs_object) const override;
+
+        void read(Input& input) override;
+        void write(Output& output) const override;
+
     protected:
         virtual ~ShaderStage();
     };

src/vsg/state/ShaderModule.cpp

@@ -22,6 +22,25 @@ using namespace vsg;
 //
 // ShaderCompileSettings
 //
+ShaderCompileSettings::ShaderCompileSettings()
+{
+}
+
+ShaderCompileSettings::ShaderCompileSettings(const ShaderCompileSettings& rhs, const CopyOp& copyop):
+    Inherit(rhs, copyop),
+    vulkanVersion(rhs.vulkanVersion),
+    clientInputVersion(rhs.clientInputVersion),
+    language(rhs.language),
+    defaultVersion(rhs.defaultVersion),
+    target(rhs.target),
+    forwardCompatible(rhs.forwardCompatible),
+    generateDebugInfo(rhs.generateDebugInfo),
+    optimize(rhs.optimize),
+    defines(rhs.defines)
+{
+    vsg::info("ShaderCompileSettings::ShaderCompileSettings(", &rhs, ", copyop)");
+}
+
 int ShaderCompileSettings::compare(const Object& rhs_object) const
 {
     int result = Object::compare(rhs_object);
@@ -92,6 +111,15 @@ ShaderModule::ShaderModule()
 {
 }
 
+ShaderModule::ShaderModule(const ShaderModule& rhs, const CopyOp& copyop):
+    Inherit(rhs, copyop),
+    source(rhs.source),
+    hints(copyop(rhs.hints)),
+    code(rhs.code)
+{
+    vsg::info("ShaderModule::ShaderModule(", &rhs, ", copyop) ");
+}
+
 ShaderModule::ShaderModule(const std::string& in_source, ref_ptr<ShaderCompileSettings> in_hints) :
     source(in_source),
     hints(in_hints)

src/vsg/state/ShaderStage.cpp

@@ -21,6 +21,17 @@ ShaderStage::ShaderStage()
 {
 }
 
+ShaderStage::ShaderStage(const ShaderStage& rhs, const CopyOp& copyop):
+    Inherit(rhs, copyop),
+    mask(rhs.mask),
+    flags(rhs.flags),
+    stage(rhs.stage),
+    module(copyop(rhs.module)),
+    entryPointName(rhs.entryPointName),
+    specializationConstants(rhs.specializationConstants)
+{
+}
+
 ShaderStage::ShaderStage(VkShaderStageFlagBits in_stage, const std::string& in_entryPointName, ref_ptr<ShaderModule> shaderModule) :
     stage(in_stage),
     module(shaderModule),