From 2dcc6333f8cbb959293832f52857bdaeab1918bf Mon Sep 17 00:00:00 2001 From: gdkchan Date: Tue, 20 Oct 2020 19:03:20 -0300 Subject: Fix image binding format (#1625) * Fix image binding format * XML doc --- Ryujinx.Graphics.Gpu/Engine/Compute.cs | 7 +- Ryujinx.Graphics.Gpu/Engine/Methods.cs | 54 +------------ Ryujinx.Graphics.Gpu/Engine/ShaderTexture.cs | 111 +++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 53 deletions(-) create mode 100644 Ryujinx.Graphics.Gpu/Engine/ShaderTexture.cs (limited to 'Ryujinx.Graphics.Gpu/Engine') diff --git a/Ryujinx.Graphics.Gpu/Engine/Compute.cs b/Ryujinx.Graphics.Gpu/Engine/Compute.cs index d718d469..1219ef0c 100644 --- a/Ryujinx.Graphics.Gpu/Engine/Compute.cs +++ b/Ryujinx.Graphics.Gpu/Engine/Compute.cs @@ -128,7 +128,7 @@ namespace Ryujinx.Graphics.Gpu.Engine { var descriptor = info.Textures[index]; - Target target = GetTarget(descriptor.Type); + Target target = ShaderTexture.GetTarget(descriptor.Type); if (descriptor.IsBindless) { @@ -148,9 +148,10 @@ namespace Ryujinx.Graphics.Gpu.Engine { var descriptor = info.Images[index]; - Target target = GetTarget(descriptor.Type); + Target target = ShaderTexture.GetTarget(descriptor.Type); + Format format = ShaderTexture.GetFormat(descriptor.Format); - imageBindings[index] = new TextureBindingInfo(target, descriptor.HandleIndex, descriptor.Flags); + imageBindings[index] = new TextureBindingInfo(target, format, descriptor.HandleIndex, descriptor.Flags); } TextureManager.SetComputeImages(imageBindings); diff --git a/Ryujinx.Graphics.Gpu/Engine/Methods.cs b/Ryujinx.Graphics.Gpu/Engine/Methods.cs index 7f567071..d4988f35 100644 --- a/Ryujinx.Graphics.Gpu/Engine/Methods.cs +++ b/Ryujinx.Graphics.Gpu/Engine/Methods.cs @@ -1014,7 +1014,7 @@ namespace Ryujinx.Graphics.Gpu.Engine { var descriptor = info.Textures[index]; - Target target = GetTarget(descriptor.Type); + Target target = ShaderTexture.GetTarget(descriptor.Type); if (descriptor.IsBindless) { @@ -1034,9 +1034,10 @@ namespace Ryujinx.Graphics.Gpu.Engine { var descriptor = info.Images[index]; - Target target = GetTarget(descriptor.Type); + Target target = ShaderTexture.GetTarget(descriptor.Type); + Format format = ShaderTexture.GetFormat(descriptor.Format); - imageBindings[index] = new TextureBindingInfo(target, descriptor.HandleIndex, descriptor.Flags); + imageBindings[index] = new TextureBindingInfo(target, format, descriptor.HandleIndex, descriptor.Flags); } TextureManager.SetGraphicsImages(stage, imageBindings); @@ -1096,53 +1097,6 @@ namespace Ryujinx.Graphics.Gpu.Engine } } - /// - /// Gets texture target from a sampler type. - /// - /// Sampler type - /// Texture target value - private static Target GetTarget(SamplerType type) - { - type &= ~(SamplerType.Indexed | SamplerType.Shadow); - - switch (type) - { - case SamplerType.Texture1D: - return Target.Texture1D; - - case SamplerType.TextureBuffer: - return Target.TextureBuffer; - - case SamplerType.Texture1D | SamplerType.Array: - return Target.Texture1DArray; - - case SamplerType.Texture2D: - return Target.Texture2D; - - case SamplerType.Texture2D | SamplerType.Array: - return Target.Texture2DArray; - - case SamplerType.Texture2D | SamplerType.Multisample: - return Target.Texture2DMultisample; - - case SamplerType.Texture2D | SamplerType.Multisample | SamplerType.Array: - return Target.Texture2DMultisampleArray; - - case SamplerType.Texture3D: - return Target.Texture3D; - - case SamplerType.TextureCube: - return Target.Cubemap; - - case SamplerType.TextureCube | SamplerType.Array: - return Target.CubemapArray; - } - - Logger.Warning?.Print(LogClass.Gpu, $"Invalid sampler type \"{type}\"."); - - return Target.Texture2D; - } - /// /// Issues a texture barrier. /// This waits until previous texture writes from the GPU to finish, before diff --git a/Ryujinx.Graphics.Gpu/Engine/ShaderTexture.cs b/Ryujinx.Graphics.Gpu/Engine/ShaderTexture.cs new file mode 100644 index 00000000..e1e3085b --- /dev/null +++ b/Ryujinx.Graphics.Gpu/Engine/ShaderTexture.cs @@ -0,0 +1,111 @@ +using Ryujinx.Common.Logging; +using Ryujinx.Graphics.GAL; +using Ryujinx.Graphics.Shader; + +namespace Ryujinx.Graphics.Gpu.Engine +{ + /// + /// Shader texture properties conversion methods. + /// + static class ShaderTexture + { + /// + /// Gets a texture target from a sampler type. + /// + /// Sampler type + /// Texture target value + public static Target GetTarget(SamplerType type) + { + type &= ~(SamplerType.Indexed | SamplerType.Shadow); + + switch (type) + { + case SamplerType.Texture1D: + return Target.Texture1D; + + case SamplerType.TextureBuffer: + return Target.TextureBuffer; + + case SamplerType.Texture1D | SamplerType.Array: + return Target.Texture1DArray; + + case SamplerType.Texture2D: + return Target.Texture2D; + + case SamplerType.Texture2D | SamplerType.Array: + return Target.Texture2DArray; + + case SamplerType.Texture2D | SamplerType.Multisample: + return Target.Texture2DMultisample; + + case SamplerType.Texture2D | SamplerType.Multisample | SamplerType.Array: + return Target.Texture2DMultisampleArray; + + case SamplerType.Texture3D: + return Target.Texture3D; + + case SamplerType.TextureCube: + return Target.Cubemap; + + case SamplerType.TextureCube | SamplerType.Array: + return Target.CubemapArray; + } + + Logger.Warning?.Print(LogClass.Gpu, $"Invalid sampler type \"{type}\"."); + + return Target.Texture2D; + } + + /// + /// Gets a texture format from a shader image format. + /// + /// Shader image format + /// Texture format + public static Format GetFormat(TextureFormat format) + { + return format switch + { + TextureFormat.R8Unorm => Format.R8Unorm, + TextureFormat.R8Snorm => Format.R8Snorm, + TextureFormat.R8Uint => Format.R8Uint, + TextureFormat.R8Sint => Format.R8Sint, + TextureFormat.R16Float => Format.R16Float, + TextureFormat.R16Unorm => Format.R16Unorm, + TextureFormat.R16Snorm => Format.R16Snorm, + TextureFormat.R16Uint => Format.R16Uint, + TextureFormat.R16Sint => Format.R16Sint, + TextureFormat.R32Float => Format.R32Float, + TextureFormat.R32Uint => Format.R32Uint, + TextureFormat.R32Sint => Format.R32Sint, + TextureFormat.R8G8Unorm => Format.R8G8Unorm, + TextureFormat.R8G8Snorm => Format.R8G8Snorm, + TextureFormat.R8G8Uint => Format.R8G8Uint, + TextureFormat.R8G8Sint => Format.R8G8Sint, + TextureFormat.R16G16Float => Format.R16G16Float, + TextureFormat.R16G16Unorm => Format.R16G16Unorm, + TextureFormat.R16G16Snorm => Format.R16G16Snorm, + TextureFormat.R16G16Uint => Format.R16G16Uint, + TextureFormat.R16G16Sint => Format.R16G16Sint, + TextureFormat.R32G32Float => Format.R32G32Float, + TextureFormat.R32G32Uint => Format.R32G32Uint, + TextureFormat.R32G32Sint => Format.R32G32Sint, + TextureFormat.R8G8B8A8Unorm => Format.R8G8B8A8Unorm, + TextureFormat.R8G8B8A8Snorm => Format.R8G8B8A8Snorm, + TextureFormat.R8G8B8A8Uint => Format.R8G8B8A8Uint, + TextureFormat.R8G8B8A8Sint => Format.R8G8B8A8Sint, + TextureFormat.R16G16B16A16Float => Format.R16G16B16A16Float, + TextureFormat.R16G16B16A16Unorm => Format.R16G16B16A16Unorm, + TextureFormat.R16G16B16A16Snorm => Format.R16G16B16A16Snorm, + TextureFormat.R16G16B16A16Uint => Format.R16G16B16A16Uint, + TextureFormat.R16G16B16A16Sint => Format.R16G16B16A16Sint, + TextureFormat.R32G32B32A32Float => Format.R32G32B32A32Float, + TextureFormat.R32G32B32A32Uint => Format.R32G32B32A32Uint, + TextureFormat.R32G32B32A32Sint => Format.R32G32B32A32Sint, + TextureFormat.R10G10B10A2Unorm => Format.R10G10B10A2Unorm, + TextureFormat.R10G10B10A2Uint => Format.R10G10B10A2Uint, + TextureFormat.R11G11B10Float => Format.R11G11B10Float, + _ => 0 + }; + } + } +} -- cgit v1.2.3