Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Moves hardcoded blend state in CCanvas2D to its technique.

Browse Source 
This was SVN commit r26216.
This commit is contained in:
Vladislav Belov 2022-01-14 17:44:42 +00:00
parent 1d9a8b2b0b
commit 829e37371b
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
binaries/data/mods/mod/shaders/effects/canvas2d.xml
View File

@ -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>

5
source/graphics/Canvas2D.cpp
View File

@ -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;