epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly fix BlendMode.Subtractive alpha handling.

Browse Source
This commit is contained in:
Paul Chote
2019-08-26 17:53:18 +01:00
committed by teinarss
parent b93c7cabb3
commit 09dd66fd5a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Platforms.Default/OpenGL.cs
View File

@@ -275,6 +275,9 @@ namespace OpenRA.Platforms.Default
public delegate void BlendEquation(int mode); public delegate void BlendEquation(int mode);
public static BlendEquation glBlendEquation { get; private set; } public static BlendEquation glBlendEquation { get; private set; }
public delegate void BlendEquationSeparate(int modeRGB, int modeAlpha);
public static BlendEquationSeparate glBlendEquationSeparate { get; private set; }
public delegate void BlendFunc(int sfactor, int dfactor); public delegate void BlendFunc(int sfactor, int dfactor);
public static BlendFunc glBlendFunc { get; private set; } public static BlendFunc glBlendFunc { get; private set; }
@@ -422,6 +425,7 @@ namespace OpenRA.Platforms.Default
glEnable = Bind<Enable>("glEnable"); glEnable = Bind<Enable>("glEnable");
glDisable = Bind<Disable>("glDisable"); glDisable = Bind<Disable>("glDisable");
glBlendEquation = Bind<BlendEquation>("glBlendEquation"); glBlendEquation = Bind<BlendEquation>("glBlendEquation");
glBlendEquationSeparate = Bind<BlendEquationSeparate>("glBlendEquationSeparate");
glBlendFunc = Bind<BlendFunc>("glBlendFunc"); glBlendFunc = Bind<BlendFunc>("glBlendFunc");
glDepthFunc = Bind<DepthFunc>("glDepthFunc"); glDepthFunc = Bind<DepthFunc>("glDepthFunc");
glScissor = Bind<Scissor>("glScissor"); glScissor = Bind<Scissor>("glScissor");

2
OpenRA.Platforms.Default/Sdl2GraphicsContext.cs
View File

@@ -241,7 +241,7 @@ namespace OpenRA.Platforms.Default
if (mode == BlendMode.Subtractive) if (mode == BlendMode.Subtractive)
{ {
OpenGL.CheckGLError(); OpenGL.CheckGLError();
OpenGL.glBlendEquation(OpenGL.GL_FUNC_REVERSE_SUBTRACT); OpenGL.glBlendEquationSeparate(OpenGL.GL_FUNC_REVERSE_SUBTRACT, OpenGL.GL_FUNC_ADD);
} }
break; break;