N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Ryujinx/src/Ryujinx.Graphics.Shader/TextureFormat.cs

131 lines
4.8 KiB
C#
Raw Normal View History

Use vector outputs for texture operations (#3939) * Change AggregateType to include vector type counts * Replace VariableType uses with AggregateType and delete VariableType * Support new local vector types on SPIR-V and GLSL * Start using vector outputs for texture operations * Use vectors on more texture operations * Use vector output for ImageLoad operations * Replace all uses of single destination texture constructors with multi destination ones * Update textureGatherOffsets replacement to split vector operations * Shader cache version bump Co-authored-by: Ac_K <Acoustik666@gmail.com>
2022-12-29 16:09:34 +01:00
using Ryujinx.Graphics.Shader.Translation;
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
namespace Ryujinx.Graphics.Shader
{
public enum TextureFormat
{
Unknown,
R8Unorm,
R8Snorm,
R8Uint,
R8Sint,
R16Float,
R16Unorm,
R16Snorm,
R16Uint,
R16Sint,
R32Float,
R32Uint,
R32Sint,
R8G8Unorm,
R8G8Snorm,
R8G8Uint,
R8G8Sint,
R16G16Float,
R16G16Unorm,
R16G16Snorm,
R16G16Uint,
R16G16Sint,
R32G32Float,
R32G32Uint,
R32G32Sint,
R8G8B8A8Unorm,
R8G8B8A8Snorm,
R8G8B8A8Uint,
R8G8B8A8Sint,
R16G16B16A16Float,
R16G16B16A16Unorm,
R16G16B16A16Snorm,
R16G16B16A16Uint,
R16G16B16A16Sint,
R32G32B32A32Float,
R32G32B32A32Uint,
R32G32B32A32Sint,
R10G10B10A2Unorm,
R10G10B10A2Uint,
[Ryujinx.Graphics.Shader] Address dotnet-format issues (#5373) * dotnet format style --severity info Some changes were manually reverted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format CA1069 warnings * Address or silence dotnet format CA2211 warnings * Address review comments * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Run dotnet format after rebase * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Add trailing commas * Remove unused members and most unnecessary value assignments * Remove more unnecessary assignments * Remove NRE suppressor
2023-06-28 08:59:13 +02:00
R11G11B10Float,
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
}
static class TextureFormatExtensions
{
public static string ToGlslFormat(this TextureFormat format)
{
return format switch
{
[Ryujinx.Graphics.Shader] Address dotnet-format issues (#5373) * dotnet format style --severity info Some changes were manually reverted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format CA1069 warnings * Address or silence dotnet format CA2211 warnings * Address review comments * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Run dotnet format after rebase * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Add trailing commas * Remove unused members and most unnecessary value assignments * Remove more unnecessary assignments * Remove NRE suppressor
2023-06-28 08:59:13 +02:00
#pragma warning disable IDE0055 // Disable formatting
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
TextureFormat.R8Unorm => "r8",
TextureFormat.R8Snorm => "r8_snorm",
TextureFormat.R8Uint => "r8ui",
TextureFormat.R8Sint => "r8i",
TextureFormat.R16Float => "r16f",
TextureFormat.R16Unorm => "r16",
TextureFormat.R16Snorm => "r16_snorm",
TextureFormat.R16Uint => "r16ui",
TextureFormat.R16Sint => "r16i",
TextureFormat.R32Float => "r32f",
TextureFormat.R32Uint => "r32ui",
TextureFormat.R32Sint => "r32i",
TextureFormat.R8G8Unorm => "rg8",
TextureFormat.R8G8Snorm => "rg8_snorm",
TextureFormat.R8G8Uint => "rg8ui",
TextureFormat.R8G8Sint => "rg8i",
TextureFormat.R16G16Float => "rg16f",
TextureFormat.R16G16Unorm => "rg16",
TextureFormat.R16G16Snorm => "rg16_snorm",
TextureFormat.R16G16Uint => "rg16ui",
TextureFormat.R16G16Sint => "rg16i",
TextureFormat.R32G32Float => "rg32f",
TextureFormat.R32G32Uint => "rg32ui",
TextureFormat.R32G32Sint => "rg32i",
TextureFormat.R8G8B8A8Unorm => "rgba8",
TextureFormat.R8G8B8A8Snorm => "rgba8_snorm",
TextureFormat.R8G8B8A8Uint => "rgba8ui",
TextureFormat.R8G8B8A8Sint => "rgba8i",
TextureFormat.R16G16B16A16Float => "rgba16f",
TextureFormat.R16G16B16A16Unorm => "rgba16",
TextureFormat.R16G16B16A16Snorm => "rgba16_snorm",
TextureFormat.R16G16B16A16Uint => "rgba16ui",
TextureFormat.R16G16B16A16Sint => "rgba16i",
TextureFormat.R32G32B32A32Float => "rgba32f",
TextureFormat.R32G32B32A32Uint => "rgba32ui",
TextureFormat.R32G32B32A32Sint => "rgba32i",
TextureFormat.R10G10B10A2Unorm => "rgb10_a2",
TextureFormat.R10G10B10A2Uint => "rgb10_a2ui",
TextureFormat.R11G11B10Float => "r11f_g11f_b10f",
[Ryujinx.Graphics.Shader] Address dotnet-format issues (#5373) * dotnet format style --severity info Some changes were manually reverted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format CA1069 warnings * Address or silence dotnet format CA2211 warnings * Address review comments * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Run dotnet format after rebase * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Add trailing commas * Remove unused members and most unnecessary value assignments * Remove more unnecessary assignments * Remove NRE suppressor
2023-06-28 08:59:13 +02:00
_ => string.Empty,
#pragma warning restore IDE0055
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
};
}
Use vector outputs for texture operations (#3939) * Change AggregateType to include vector type counts * Replace VariableType uses with AggregateType and delete VariableType * Support new local vector types on SPIR-V and GLSL * Start using vector outputs for texture operations * Use vectors on more texture operations * Use vector output for ImageLoad operations * Replace all uses of single destination texture constructors with multi destination ones * Update textureGatherOffsets replacement to split vector operations * Shader cache version bump Co-authored-by: Ac_K <Acoustik666@gmail.com>
2022-12-29 16:09:34 +01:00
public static AggregateType GetComponentType(this TextureFormat format)
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
{
switch (format)
{
case TextureFormat.R8Uint:
case TextureFormat.R16Uint:
case TextureFormat.R32Uint:
case TextureFormat.R8G8Uint:
case TextureFormat.R16G16Uint:
case TextureFormat.R32G32Uint:
case TextureFormat.R8G8B8A8Uint:
case TextureFormat.R16G16B16A16Uint:
case TextureFormat.R32G32B32A32Uint:
case TextureFormat.R10G10B10A2Uint:
Use vector outputs for texture operations (#3939) * Change AggregateType to include vector type counts * Replace VariableType uses with AggregateType and delete VariableType * Support new local vector types on SPIR-V and GLSL * Start using vector outputs for texture operations * Use vectors on more texture operations * Use vector output for ImageLoad operations * Replace all uses of single destination texture constructors with multi destination ones * Update textureGatherOffsets replacement to split vector operations * Shader cache version bump Co-authored-by: Ac_K <Acoustik666@gmail.com>
2022-12-29 16:09:34 +01:00
return AggregateType.U32;
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
case TextureFormat.R8Sint:
case TextureFormat.R16Sint:
case TextureFormat.R32Sint:
case TextureFormat.R8G8Sint:
case TextureFormat.R16G16Sint:
case TextureFormat.R32G32Sint:
case TextureFormat.R8G8B8A8Sint:
case TextureFormat.R16G16B16A16Sint:
case TextureFormat.R32G32B32A32Sint:
Use vector outputs for texture operations (#3939) * Change AggregateType to include vector type counts * Replace VariableType uses with AggregateType and delete VariableType * Support new local vector types on SPIR-V and GLSL * Start using vector outputs for texture operations * Use vectors on more texture operations * Use vector output for ImageLoad operations * Replace all uses of single destination texture constructors with multi destination ones * Update textureGatherOffsets replacement to split vector operations * Shader cache version bump Co-authored-by: Ac_K <Acoustik666@gmail.com>
2022-12-29 16:09:34 +01:00
return AggregateType.S32;
Removed extra semicolons. (#3594)
2022-08-17 09:05:15 +02:00
}
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
Use vector outputs for texture operations (#3939) * Change AggregateType to include vector type counts * Replace VariableType uses with AggregateType and delete VariableType * Support new local vector types on SPIR-V and GLSL * Start using vector outputs for texture operations * Use vectors on more texture operations * Use vector output for ImageLoad operations * Replace all uses of single destination texture constructors with multi destination ones * Update textureGatherOffsets replacement to split vector operations * Shader cache version bump Co-authored-by: Ac_K <Acoustik666@gmail.com>
2022-12-29 16:09:34 +01:00
return AggregateType.FP32;
Implement SULD shader instruction (#1117) * Implement SULD shader instruction * Some nits
2020-04-22 01:35:28 +02:00
}
}
}
Reference in a new issue Copy permalink