ShaderMacroHelper: handle null macro definitions

TheMostDiligent · TheMostDiligent · commit 04fc89861d17 · 2024-08-22T21:24:20.000-07:00
diff --git a/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp b/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2023 Diligent Graphics LLC
+ *  Copyright 2019-2024 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -197,7 +197,7 @@ class ShaderMacroHelper
 template <>
 inline ShaderMacroHelper& ShaderMacroHelper::AddShaderMacro(const Char* Name, const Char* Definition)
 {
-    return Add(ShaderMacro{Name, Definition});
+    return Add(ShaderMacro{Name, Definition != nullptr ? Definition : ""});
 }
 
 template <>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2019-2023 Diligent Graphics LLC`
	`2`	`+ * Copyright 2019-2024 Diligent Graphics LLC`
`3`	`3`	`* Copyright 2015-2019 Egor Yusov`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`@@ -197,7 +197,7 @@ class ShaderMacroHelper`
`197`	`197`	`template <>`
`198`	`198`	`inline ShaderMacroHelper& ShaderMacroHelper::AddShaderMacro(const Char* Name, const Char* Definition)`
`199`	`199`	`{`
`200`		`- return Add(ShaderMacro{Name, Definition});`
	`200`	`+ return Add(ShaderMacro{Name, Definition != nullptr ? Definition : ""});`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`template <>`