From 47e3bec134f5fbbeec82c58dbcfe84059379b0dd Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Sat, 30 Jun 2018 15:27:44 -0300 Subject: [PATCH] Add ConstantColor for 0xC001 (G80) from PR #145 --- Ryujinx.Graphics/Gal/GalBlendFactor.cs | 3 ++- Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Ryujinx.Graphics/Gal/GalBlendFactor.cs b/Ryujinx.Graphics/Gal/GalBlendFactor.cs index 7237c4edac..001aaaeca8 100644 --- a/Ryujinx.Graphics/Gal/GalBlendFactor.cs +++ b/Ryujinx.Graphics/Gal/GalBlendFactor.cs @@ -20,6 +20,7 @@ namespace Ryujinx.Graphics.Gal ConstantColor = 0x61, OneMinusConstantColor = 0x62, ConstantAlpha = 0x63, - OneMinusConstantAlpha = 0x64 + OneMinusConstantAlpha = 0x64, + ConstantColorG80 = 0xc001 } } \ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs index cb2c1a0e8b..349c695e5b 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs @@ -187,7 +187,6 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalBlendFactor.OneMinusSrcAlpha: return BlendingFactor.OneMinusSrcAlpha; case GalBlendFactor.DstAlpha: return BlendingFactor.DstAlpha; case GalBlendFactor.OneMinusDstAlpha: return BlendingFactor.OneMinusDstAlpha; - case GalBlendFactor.ConstantColor: return BlendingFactor.ConstantColor; case GalBlendFactor.OneMinusConstantColor: return BlendingFactor.OneMinusConstantColor; case GalBlendFactor.ConstantAlpha: return BlendingFactor.ConstantAlpha; case GalBlendFactor.OneMinusConstantAlpha: return BlendingFactor.OneMinusConstantAlpha; @@ -196,6 +195,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalBlendFactor.OneMinusSrc1Color: return (BlendingFactor)BlendingFactorSrc.OneMinusSrc1Color; case GalBlendFactor.Src1Alpha: return BlendingFactor.Src1Alpha; case GalBlendFactor.OneMinusSrc1Alpha: return (BlendingFactor)BlendingFactorSrc.OneMinusSrc1Alpha; + + case GalBlendFactor.ConstantColor: + case GalBlendFactor.ConstantColorG80: + return BlendingFactor.ConstantColor; } throw new ArgumentException(nameof(BlendFactor));