#6052: Don't write the default blend func pair gl_one, gl_zero into t…

…he stage
codereader · Aug 5, 2022 · fbf84b7 · fbf84b7
1 parent 847218f
commit fbf84b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/libs/materials/ParseLib.h b/libs/materials/ParseLib.h
@@ -6,6 +6,7 @@
 #include "ishaderlayer.h"
 #include "gamelib.h"
 #include "os/path.h"
+#include "string/case_conv.h"
 #include "xmlutil/MissingXMLNodeException.h"
 
 namespace shaders
@@ -294,6 +295,12 @@ constexpr std::pair<const char*, std::pair<const char*, const char*>> BlendTypeS
     { "none", { "gl_zero", "gl_one" } },
 };
 
+inline bool isDefaultBlendFunc(const std::pair<std::string, std::string>& blendFuncStrings)
+{
+    return string::to_lower_copy(blendFuncStrings.first) == "gl_one" && 
+           string::to_lower_copy(blendFuncStrings.second) == "gl_zero";
+}
+
 constexpr std::pair<const char*, IShaderLayer::TexGenType> TexGenTypeNames[]
 {
     { "normal", IShaderLayer::TEXGEN_NORMAL },

diff --git a/radiantcore/shaders/MaterialSourceGenerator.cpp b/radiantcore/shaders/MaterialSourceGenerator.cpp
@@ -295,12 +295,12 @@ namespace
 
 }
 
-void writeBlendMap(std::ostream& stream, Doom3ShaderLayer& layer)
+void writeBlendMap(std::ostream& stream, const Doom3ShaderLayer& layer)
 {
     // Blend types
     const auto& blendFunc = layer.getBlendFuncStrings();
 
-    if (!blendFunc.first.empty())
+    if (!blendFunc.first.empty() && !isDefaultBlendFunc(blendFunc))
     {
         stream << "\t\tblend " << blendFunc.first;