From a5e20a8fd1de446d2948c500c95cf65b88a36687 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Fri, 17 Jan 2020 05:55:38 -0300 Subject: [PATCH] Add sampler border color support on the GPU (#893) --- Ryujinx.Graphics.Gpu/Image/Sampler.cs | 6 +++++- Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Image/Sampler.cs b/Ryujinx.Graphics.Gpu/Image/Sampler.cs index 23c6160e39..45f5f519fb 100644 --- a/Ryujinx.Graphics.Gpu/Image/Sampler.cs +++ b/Ryujinx.Graphics.Gpu/Image/Sampler.cs @@ -30,7 +30,11 @@ namespace Ryujinx.Graphics.Gpu.Image CompareMode compareMode = descriptor.UnpackCompareMode(); CompareOp compareOp = descriptor.UnpackCompareOp(); - ColorF color = new ColorF(0, 0, 0, 0); + ColorF color = new ColorF( + descriptor.BorderColorR, + descriptor.BorderColorG, + descriptor.BorderColorB, + descriptor.BorderColorA); float minLod = descriptor.UnpackMinLod(); float maxLod = descriptor.UnpackMaxLod(); diff --git a/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs b/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs index 80b1b70fd5..77af1ce0fe 100644 --- a/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs +++ b/Ryujinx.Graphics.Gpu/Image/SamplerDescriptor.cs @@ -55,10 +55,10 @@ namespace Ryujinx.Graphics.Gpu.Image public uint Word1; public uint Word2; public uint Word3; - public uint BorderColorR; - public uint BorderColorG; - public uint BorderColorB; - public uint BorderColorA; + public float BorderColorR; + public float BorderColorG; + public float BorderColorB; + public float BorderColorA; /// /// Unpacks the texture wrap mode along the X axis.