From 5936a3e40b7a2da33e52e2aa3baee7fc57f9fdca Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Mon, 1 Feb 2021 23:09:07 -0800
Subject: Reworked ShaderResourceLayoutTest.FormattedBuffers and
 ShaderResourceLayoutTest.StructuredBuffers to make them more robust

---
 Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Graphics')

diff --git a/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp b/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp
index 207d9020..ed1a48ff 100644
--- a/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp
+++ b/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp
@@ -73,6 +73,15 @@ public:
         AddShaderMacro<const Char*>(Name, ss.str().c_str());
     }
 
+    ShaderMacroHelper() = default;
+
+    // NB: string pointers in m_Macros may become invalid after the
+    //     copy or move due to short string optimization in std::string
+    ShaderMacroHelper(const ShaderMacroHelper&) = delete;
+    ShaderMacroHelper(ShaderMacroHelper&&)      = delete;
+    ShaderMacroHelper& operator=(const ShaderMacroHelper&) = delete;
+    ShaderMacroHelper& operator=(ShaderMacroHelper&&) = delete;
+
     void Finalize()
     {
         if (!m_bIsFinalized)
-- 
cgit v1.2.3