From 9cbf908cf5b7796fb459d74f99b2ebfcd3a4d648 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Tue, 3 Jul 2018 20:06:13 -0300 Subject: Add FaceAttr in GLSL, unmanaged case in EmitTex and ConstantColorG80 blend factor (#207) * Add FaceAttr (0x3fc) input attribute in GLSL * Implement unmanaged case in EmitTex * Add ConstantColor for 0xC001 (G80) from PR #145 --- Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Ryujinx.Graphics/Gal/OpenGL') diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs index cb2c1a0e..349c695e 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)); -- cgit v1.2.3