summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsTools
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2021-02-02 07:09:07 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-02-04 16:52:42 +0000
commitc0246cc70ac5c46671b08439fa2d16a007a7ffe9 (patch)
tree7e523f3477cee58a75c410a27804e29314541d0e /Graphics/GraphicsTools
parentFixed DiligentCoreAPITest on Linux when OpenGL backend is disabled (diff)
downloadDiligentCore-c0246cc70ac5c46671b08439fa2d16a007a7ffe9.tar.gz
DiligentCore-c0246cc70ac5c46671b08439fa2d16a007a7ffe9.zip
Reworked ShaderResourceLayoutTest.FormattedBuffers and ShaderResourceLayoutTest.StructuredBuffers to make them more robust
Diffstat (limited to 'Graphics/GraphicsTools')
-rw-r--r--Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp9
1 files changed, 9 insertions, 0 deletions
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)