From 829e37371ba227c6a886b06bb83040b9dc276f9b Mon Sep 17 00:00:00 2001
From: vladislavbelov <vladislavbelov@wildfiregames.com>
Date: Fri, 14 Jan 2022 17:44:42 +0000
Subject: [PATCH] Moves hardcoded blend state in CCanvas2D to its technique.

This was SVN commit r26216.
---
 .../mods/mod/shaders/effects/canvas2d.xml     | 20 +++++++++++--------
 source/graphics/Canvas2D.cpp                  |  5 -----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/binaries/data/mods/mod/shaders/effects/canvas2d.xml b/binaries/data/mods/mod/shaders/effects/canvas2d.xml
index 5cd236fa47..21c7014b02 100644
--- a/binaries/data/mods/mod/shaders/effects/canvas2d.xml
+++ b/binaries/data/mods/mod/shaders/effects/canvas2d.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>
 
-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/canvas2d"/>
-    </technique>
+	<technique>
+		<require shaders="arb"/>
+		<pass shader="arb/canvas2d">
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
 
-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/canvas2d"/>
-    </technique>
+	<technique>
+		<require shaders="glsl"/>
+		<pass shader="glsl/canvas2d">
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
 
 </effect>
diff --git a/source/graphics/Canvas2D.cpp b/source/graphics/Canvas2D.cpp
index b8175cb7fc..1302e61215 100644
--- a/source/graphics/Canvas2D.cpp
+++ b/source/graphics/Canvas2D.cpp
@@ -71,9 +71,6 @@ public:
 		if (Tech)
 			return;
 
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
 		CShaderDefines defines;
 		Tech = g_Renderer.GetShaderManager().LoadEffect(str_canvas2d, defines);
 		ENSURE(Tech);
@@ -87,8 +84,6 @@ public:
 
 		Tech->EndPass();
 		Tech.reset();
-
-		glDisable(GL_BLEND);
 	}
 
 	CShaderTechniquePtr Tech;