summaryrefslogtreecommitdiffstats
path: root/Graphics
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2021-02-02 07:09:07 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-02-02 07:09:07 +0000
commit5936a3e40b7a2da33e52e2aa3baee7fc57f9fdca (patch)
treea0395f09159e6bed0819478c35878eba4a26c5db /Graphics
parentFixed DiligentCoreAPITest on Linux when OpenGL backend is disabled (diff)
downloadDiligentCore-5936a3e40b7a2da33e52e2aa3baee7fc57f9fdca.tar.gz
DiligentCore-5936a3e40b7a2da33e52e2aa3baee7fc57f9fdca.zip
Reworked ShaderResourceLayoutTest.FormattedBuffers and ShaderResourceLayoutTest.StructuredBuffers to make them more robust
Diffstat (limited to 'Graphics')
-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)