From 5f91ce3d16f145789685837d2fad2ce57b863b3e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 14 Jan 2025 14:54:23 +0000 Subject: [PATCH] Non sRGB changes pulled in from the ColorSpace2 branch. --- include/vsg/io/Input.h | 1 + include/vsg/io/Output.h | 4 +++- include/vsg/state/DescriptorSet.h | 3 +++ src/vsg/io/Output.cpp | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/vsg/io/Input.h b/include/vsg/io/Input.h index 0bded3bbc6..62912ca748 100644 --- a/include/vsg/io/Input.h +++ b/include/vsg/io/Input.h @@ -45,6 +45,7 @@ namespace vsg public: Input(ref_ptr in_objectFactory, ref_ptr in_options = {}); + Input(const Input&) = delete; Input& operator=(const Input& rhs) = delete; /// return true if property name matches the next token in the stream, or if property names are not required for format diff --git a/include/vsg/io/Output.h b/include/vsg/io/Output.h index 216b1aabb7..9150e65de6 100644 --- a/include/vsg/io/Output.h +++ b/include/vsg/io/Output.h @@ -40,8 +40,10 @@ namespace vsg class VSG_DECLSPEC Output { public: - Output(ref_ptr in_options = {}); + Output(); + Output(ref_ptr in_options); + Output(const Output&) = delete; Output& operator=(const Output& rhs) = delete; /// write property name if appropriate for format diff --git a/include/vsg/state/DescriptorSet.h b/include/vsg/state/DescriptorSet.h index b6e6ee424b..ff12f21630 100644 --- a/include/vsg/state/DescriptorSet.h +++ b/include/vsg/state/DescriptorSet.h @@ -69,6 +69,9 @@ namespace vsg public: Implementation(DescriptorPool* descriptorPool, DescriptorSetLayout* descriptorSetLayout); + Implementation(const Implementation&) = delete; + Implementation& operator=(const Implementation&) = delete; + void assign(Context& context, const Descriptors& descriptors); VkDescriptorSet _descriptorSet; diff --git a/src/vsg/io/Output.cpp b/src/vsg/io/Output.cpp index 2feb71cd3b..c50d7f3b43 100644 --- a/src/vsg/io/Output.cpp +++ b/src/vsg/io/Output.cpp @@ -15,6 +15,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI using namespace vsg; +Output::Output() : + Output(nullptr) +{ +} + Output::Output(ref_ptr in_options) : options(in_options), version{vsgGetVersion()}