diff options
| author | TSR Berry <20988865+TSRBerry@users.noreply.github.com> | 2023-04-08 01:22:00 +0200 |
|---|---|---|
| committer | Mary <thog@protonmail.com> | 2023-04-27 23:51:14 +0200 |
| commit | cee712105850ac3385cd0091a923438167433f9f (patch) | |
| tree | 4a5274b21d8b7f938c0d0ce18736d3f2993b11b1 /Ryujinx.Graphics.Shader/CodeGen/Glsl | |
| parent | cd124bda587ef09668a971fa1cac1c3f0cfc9f21 (diff) | |
Move solution and projects to src
Diffstat (limited to 'Ryujinx.Graphics.Shader/CodeGen/Glsl')
33 files changed, 0 insertions, 3564 deletions
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/CodeGenContext.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/CodeGenContext.cs deleted file mode 100644 index 9eb20f6f..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/CodeGenContext.cs +++ /dev/null @@ -1,95 +0,0 @@ -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; -using System.Text; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - class CodeGenContext - { - public const string Tab = " "; - - public StructuredFunction CurrentFunction { get; set; } - - public StructuredProgramInfo Info { get; } - - public ShaderConfig Config { get; } - - public OperandManager OperandManager { get; } - - private readonly StringBuilder _sb; - - private int _level; - - private string _indentation; - - public CodeGenContext(StructuredProgramInfo info, ShaderConfig config) - { - Info = info; - Config = config; - - OperandManager = new OperandManager(); - - _sb = new StringBuilder(); - } - - public void AppendLine() - { - _sb.AppendLine(); - } - - public void AppendLine(string str) - { - _sb.AppendLine(_indentation + str); - } - - public string GetCode() - { - return _sb.ToString(); - } - - public void EnterScope() - { - AppendLine("{"); - - _level++; - - UpdateIndentation(); - } - - public void LeaveScope(string suffix = "") - { - if (_level == 0) - { - return; - } - - _level--; - - UpdateIndentation(); - - AppendLine("}" + suffix); - } - - public StructuredFunction GetFunction(int id) - { - return Info.Functions[id]; - } - - private void UpdateIndentation() - { - _indentation = GetIndentation(_level); - } - - private static string GetIndentation(int level) - { - string indentation = string.Empty; - - for (int index = 0; index < level; index++) - { - indentation += Tab; - } - - return indentation; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs deleted file mode 100644 index 81b79ec4..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs +++ /dev/null @@ -1,818 +0,0 @@ -using Ryujinx.Common; -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Numerics; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - static class Declarations - { - public static void Declare(CodeGenContext context, StructuredProgramInfo info) - { - context.AppendLine(context.Config.Options.TargetApi == TargetApi.Vulkan ? "#version 460 core" : "#version 450 core"); - context.AppendLine("#extension GL_ARB_gpu_shader_int64 : enable"); - - if (context.Config.GpuAccessor.QueryHostSupportsShaderBallot()) - { - context.AppendLine("#extension GL_ARB_shader_ballot : enable"); - } - else - { - context.AppendLine("#extension GL_KHR_shader_subgroup_basic : enable"); - context.AppendLine("#extension GL_KHR_shader_subgroup_ballot : enable"); - } - - context.AppendLine("#extension GL_ARB_shader_group_vote : enable"); - context.AppendLine("#extension GL_EXT_shader_image_load_formatted : enable"); - context.AppendLine("#extension GL_EXT_texture_shadow_lod : enable"); - - if (context.Config.Stage == ShaderStage.Compute) - { - context.AppendLine("#extension GL_ARB_compute_shader : enable"); - } - else if (context.Config.Stage == ShaderStage.Fragment) - { - if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderInterlock()) - { - context.AppendLine("#extension GL_ARB_fragment_shader_interlock : enable"); - } - else if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderOrderingIntel()) - { - context.AppendLine("#extension GL_INTEL_fragment_shader_ordering : enable"); - } - } - else - { - if (context.Config.Stage == ShaderStage.Vertex) - { - context.AppendLine("#extension GL_ARB_shader_draw_parameters : enable"); - } - - context.AppendLine("#extension GL_ARB_shader_viewport_layer_array : enable"); - } - - if (context.Config.GpPassthrough && context.Config.GpuAccessor.QueryHostSupportsGeometryShaderPassthrough()) - { - context.AppendLine("#extension GL_NV_geometry_shader_passthrough : enable"); - } - - if (context.Config.GpuAccessor.QueryHostSupportsViewportMask()) - { - context.AppendLine("#extension GL_NV_viewport_array2 : enable"); - } - - context.AppendLine("#pragma optionNV(fastmath off)"); - context.AppendLine(); - - context.AppendLine($"const int {DefaultNames.UndefinedName} = 0;"); - context.AppendLine(); - - if (context.Config.Stage == ShaderStage.Compute) - { - int localMemorySize = BitUtils.DivRoundUp(context.Config.GpuAccessor.QueryComputeLocalMemorySize(), 4); - - if (localMemorySize != 0) - { - string localMemorySizeStr = NumberFormatter.FormatInt(localMemorySize); - - context.AppendLine($"uint {DefaultNames.LocalMemoryName}[{localMemorySizeStr}];"); - context.AppendLine(); - } - - int sharedMemorySize = BitUtils.DivRoundUp(context.Config.GpuAccessor.QueryComputeSharedMemorySize(), 4); - - if (sharedMemorySize != 0) - { - string sharedMemorySizeStr = NumberFormatter.FormatInt(sharedMemorySize); - - context.AppendLine($"shared uint {DefaultNames.SharedMemoryName}[{sharedMemorySizeStr}];"); - context.AppendLine(); - } - } - else if (context.Config.LocalMemorySize != 0) - { - int localMemorySize = BitUtils.DivRoundUp(context.Config.LocalMemorySize, 4); - - string localMemorySizeStr = NumberFormatter.FormatInt(localMemorySize); - - context.AppendLine($"uint {DefaultNames.LocalMemoryName}[{localMemorySizeStr}];"); - context.AppendLine(); - } - - var cBufferDescriptors = context.Config.GetConstantBufferDescriptors(); - if (cBufferDescriptors.Length != 0) - { - DeclareUniforms(context, cBufferDescriptors); - - context.AppendLine(); - } - - var sBufferDescriptors = context.Config.GetStorageBufferDescriptors(); - if (sBufferDescriptors.Length != 0) - { - DeclareStorages(context, sBufferDescriptors); - - context.AppendLine(); - } - - var textureDescriptors = context.Config.GetTextureDescriptors(); - if (textureDescriptors.Length != 0) - { - DeclareSamplers(context, textureDescriptors); - - context.AppendLine(); - } - - var imageDescriptors = context.Config.GetImageDescriptors(); - if (imageDescriptors.Length != 0) - { - DeclareImages(context, imageDescriptors); - - context.AppendLine(); - } - - if (context.Config.Stage != ShaderStage.Compute) - { - if (context.Config.Stage == ShaderStage.Geometry) - { - InputTopology inputTopology = context.Config.GpuAccessor.QueryPrimitiveTopology(); - string inPrimitive = inputTopology.ToGlslString(); - - context.AppendLine($"layout (invocations = {context.Config.ThreadsPerInputPrimitive}, {inPrimitive}) in;"); - - if (context.Config.GpPassthrough && context.Config.GpuAccessor.QueryHostSupportsGeometryShaderPassthrough()) - { - context.AppendLine($"layout (passthrough) in gl_PerVertex"); - context.EnterScope(); - context.AppendLine("vec4 gl_Position;"); - context.AppendLine("float gl_PointSize;"); - context.AppendLine("float gl_ClipDistance[];"); - context.LeaveScope(";"); - } - else - { - string outPrimitive = context.Config.OutputTopology.ToGlslString(); - - int maxOutputVertices = context.Config.GpPassthrough - ? inputTopology.ToInputVertices() - : context.Config.MaxOutputVertices; - - context.AppendLine($"layout ({outPrimitive}, max_vertices = {maxOutputVertices}) out;"); - } - - context.AppendLine(); - } - else if (context.Config.Stage == ShaderStage.TessellationControl) - { - int threadsPerInputPrimitive = context.Config.ThreadsPerInputPrimitive; - - context.AppendLine($"layout (vertices = {threadsPerInputPrimitive}) out;"); - context.AppendLine(); - } - else if (context.Config.Stage == ShaderStage.TessellationEvaluation) - { - bool tessCw = context.Config.GpuAccessor.QueryTessCw(); - - if (context.Config.Options.TargetApi == TargetApi.Vulkan) - { - // We invert the front face on Vulkan backend, so we need to do that here aswell. - tessCw = !tessCw; - } - - string patchType = context.Config.GpuAccessor.QueryTessPatchType().ToGlsl(); - string spacing = context.Config.GpuAccessor.QueryTessSpacing().ToGlsl(); - string windingOrder = tessCw ? "cw" : "ccw"; - - context.AppendLine($"layout ({patchType}, {spacing}, {windingOrder}) in;"); - context.AppendLine(); - } - - if (context.Config.UsedInputAttributes != 0 || context.Config.GpPassthrough) - { - DeclareInputAttributes(context, info); - - context.AppendLine(); - } - - if (context.Config.UsedOutputAttributes != 0 || context.Config.Stage != ShaderStage.Fragment) - { - DeclareOutputAttributes(context, info); - - context.AppendLine(); - } - - if (context.Config.UsedInputAttributesPerPatch.Count != 0) - { - DeclareInputAttributesPerPatch(context, context.Config.UsedInputAttributesPerPatch); - - context.AppendLine(); - } - - if (context.Config.UsedOutputAttributesPerPatch.Count != 0) - { - DeclareUsedOutputAttributesPerPatch(context, context.Config.UsedOutputAttributesPerPatch); - - context.AppendLine(); - } - - if (context.Config.TransformFeedbackEnabled && context.Config.LastInVertexPipeline) - { - var tfOutput = context.Config.GetTransformFeedbackOutput(AttributeConsts.PositionX); - if (tfOutput.Valid) - { - context.AppendLine($"layout (xfb_buffer = {tfOutput.Buffer}, xfb_offset = {tfOutput.Offset}, xfb_stride = {tfOutput.Stride}) out gl_PerVertex"); - context.EnterScope(); - context.AppendLine("vec4 gl_Position;"); - context.LeaveScope(context.Config.Stage == ShaderStage.TessellationControl ? " gl_out[];" : ";"); - } - } - } - else - { - string localSizeX = NumberFormatter.FormatInt(context.Config.GpuAccessor.QueryComputeLocalSizeX()); - string localSizeY = NumberFormatter.FormatInt(context.Config.GpuAccessor.QueryComputeLocalSizeY()); - string localSizeZ = NumberFormatter.FormatInt(context.Config.GpuAccessor.QueryComputeLocalSizeZ()); - - context.AppendLine( - "layout (" + - $"local_size_x = {localSizeX}, " + - $"local_size_y = {localSizeY}, " + - $"local_size_z = {localSizeZ}) in;"); - context.AppendLine(); - } - - bool isFragment = context.Config.Stage == ShaderStage.Fragment; - - if (isFragment || context.Config.Stage == ShaderStage.Compute || context.Config.Stage == ShaderStage.Vertex) - { - if (isFragment && context.Config.GpuAccessor.QueryEarlyZForce()) - { - context.AppendLine("layout(early_fragment_tests) in;"); - context.AppendLine(); - } - - if ((context.Config.UsedFeatures & (FeatureFlags.FragCoordXY | FeatureFlags.IntegerSampling)) != 0) - { - string stage = OperandManager.GetShaderStagePrefix(context.Config.Stage); - - int scaleElements = context.Config.GetTextureDescriptors().Length + context.Config.GetImageDescriptors().Length; - - if (isFragment) - { - scaleElements++; // Also includes render target scale, for gl_FragCoord. - } - - DeclareSupportUniformBlock(context, context.Config.Stage, scaleElements); - - if (context.Config.UsedFeatures.HasFlag(FeatureFlags.IntegerSampling) && scaleElements != 0) - { - AppendHelperFunction(context, $"Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_{stage}.glsl"); - context.AppendLine(); - } - } - else if (isFragment || context.Config.Stage == ShaderStage.Vertex) - { - DeclareSupportUniformBlock(context, context.Config.Stage, 0); - } - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.AtomicMinMaxS32Shared) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Shared.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.AtomicMinMaxS32Storage) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Storage.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.MultiplyHighS32) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighS32.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.MultiplyHighU32) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighU32.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.Shuffle) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/Shuffle.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.ShuffleDown) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleDown.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.ShuffleUp) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleUp.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.ShuffleXor) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleXor.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.StoreSharedSmallInt) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreSharedSmallInt.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.StoreStorageSmallInt) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreStorageSmallInt.glsl"); - } - - if ((info.HelperFunctionsMask & HelperFunctionsMask.SwizzleAdd) != 0) - { - AppendHelperFunction(context, "Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/SwizzleAdd.glsl"); - } - } - - private static string GetTfLayout(TransformFeedbackOutput tfOutput) - { - if (tfOutput.Valid) - { - return $"layout (xfb_buffer = {tfOutput.Buffer}, xfb_offset = {tfOutput.Offset}, xfb_stride = {tfOutput.Stride}) "; - } - - return string.Empty; - } - - public static void DeclareLocals(CodeGenContext context, StructuredFunction function) - { - foreach (AstOperand decl in function.Locals) - { - string name = context.OperandManager.DeclareLocal(decl); - - context.AppendLine(GetVarTypeName(context, decl.VarType) + " " + name + ";"); - } - } - - public static string GetVarTypeName(CodeGenContext context, AggregateType type, bool precise = true) - { - if (context.Config.GpuAccessor.QueryHostReducedPrecision()) - { - precise = false; - } - - return type switch - { - AggregateType.Void => "void", - AggregateType.Bool => "bool", - AggregateType.FP32 => precise ? "precise float" : "float", - AggregateType.FP64 => "double", - AggregateType.S32 => "int", - AggregateType.U32 => "uint", - AggregateType.Vector2 | AggregateType.Bool => "bvec2", - AggregateType.Vector2 | AggregateType.FP32 => precise ? "precise vec2" : "vec2", - AggregateType.Vector2 | AggregateType.FP64 => "dvec2", - AggregateType.Vector2 | AggregateType.S32 => "ivec2", - AggregateType.Vector2 | AggregateType.U32 => "uvec2", - AggregateType.Vector3 | AggregateType.Bool => "bvec3", - AggregateType.Vector3 | AggregateType.FP32 => precise ? "precise vec3" : "vec3", - AggregateType.Vector3 | AggregateType.FP64 => "dvec3", - AggregateType.Vector3 | AggregateType.S32 => "ivec3", - AggregateType.Vector3 | AggregateType.U32 => "uvec3", - AggregateType.Vector4 | AggregateType.Bool => "bvec4", - AggregateType.Vector4 | AggregateType.FP32 => precise ? "precise vec4" : "vec4", - AggregateType.Vector4 | AggregateType.FP64 => "dvec4", - AggregateType.Vector4 | AggregateType.S32 => "ivec4", - AggregateType.Vector4 | AggregateType.U32 => "uvec4", - _ => throw new ArgumentException($"Invalid variable type \"{type}\".") - }; - } - - private static void DeclareUniforms(CodeGenContext context, BufferDescriptor[] descriptors) - { - string ubSize = "[" + NumberFormatter.FormatInt(Constants.ConstantBufferSize / 16) + "]"; - - if (context.Config.UsedFeatures.HasFlag(FeatureFlags.CbIndexing)) - { - string ubName = OperandManager.GetShaderStagePrefix(context.Config.Stage); - - ubName += "_" + DefaultNames.UniformNamePrefix; - - string blockName = $"{ubName}_{DefaultNames.BlockSuffix}"; - - context.AppendLine($"layout (binding = {context.Config.FirstConstantBufferBinding}, std140) uniform {blockName}"); - context.EnterScope(); - context.AppendLine("vec4 " + DefaultNames.DataName + ubSize + ";"); - context.LeaveScope($" {ubName}[{NumberFormatter.FormatInt(descriptors.Max(x => x.Slot) + 1)}];"); - } - else - { - foreach (var descriptor in descriptors) - { - string ubName = OperandManager.GetShaderStagePrefix(context.Config.Stage); - - ubName += "_" + DefaultNames.UniformNamePrefix + descriptor.Slot; - - context.AppendLine($"layout (binding = {descriptor.Binding}, std140) uniform {ubName}"); - context.EnterScope(); - context.AppendLine("vec4 " + OperandManager.GetUbName(context.Config.Stage, descriptor.Slot, false) + ubSize + ";"); - context.LeaveScope(";"); - } - } - } - - private static void DeclareStorages(CodeGenContext context, BufferDescriptor[] descriptors) - { - string sbName = OperandManager.GetShaderStagePrefix(context.Config.Stage); - - sbName += "_" + DefaultNames.StorageNamePrefix; - - string blockName = $"{sbName}_{DefaultNames.BlockSuffix}"; - - string layout = context.Config.Options.TargetApi == TargetApi.Vulkan ? ", set = 1" : string.Empty; - - context.AppendLine($"layout (binding = {context.Config.FirstStorageBufferBinding}{layout}, std430) buffer {blockName}"); - context.EnterScope(); - context.AppendLine("uint " + DefaultNames.DataName + "[];"); - context.LeaveScope($" {sbName}[{NumberFormatter.FormatInt(descriptors.Max(x => x.Slot) + 1)}];"); - } - - private static void DeclareSamplers(CodeGenContext context, TextureDescriptor[] descriptors) - { - int arraySize = 0; - foreach (var descriptor in descriptors) - { - if (descriptor.Type.HasFlag(SamplerType.Indexed)) - { - if (arraySize == 0) - { - arraySize = ShaderConfig.SamplerArraySize; - } - else if (--arraySize != 0) - { - continue; - } - } - - string indexExpr = NumberFormatter.FormatInt(arraySize); - - string samplerName = OperandManager.GetSamplerName( - context.Config.Stage, - descriptor.CbufSlot, - descriptor.HandleIndex, - descriptor.Type.HasFlag(SamplerType.Indexed), - indexExpr); - - string samplerTypeName = descriptor.Type.ToGlslSamplerType(); - - string layout = string.Empty; - - if (context.Config.Options.TargetApi == TargetApi.Vulkan) - { - layout = ", set = 2"; - } - - context.AppendLine($"layout (binding = {descriptor.Binding}{layout}) uniform {samplerTypeName} {samplerName};"); - } - } - - private static void DeclareImages(CodeGenContext context, TextureDescriptor[] descriptors) - { - int arraySize = 0; - foreach (var descriptor in descriptors) - { - if (descriptor.Type.HasFlag(SamplerType.Indexed)) - { - if (arraySize == 0) - { - arraySize = ShaderConfig.SamplerArraySize; - } - else if (--arraySize != 0) - { - continue; - } - } - - string indexExpr = NumberFormatter.FormatInt(arraySize); - - string imageName = OperandManager.GetImageName( - context.Config.Stage, - descriptor.CbufSlot, - descriptor.HandleIndex, - descriptor.Format, - descriptor.Type.HasFlag(SamplerType.Indexed), - indexExpr); - - string imageTypeName = descriptor.Type.ToGlslImageType(descriptor.Format.GetComponentType()); - - if (descriptor.Flags.HasFlag(TextureUsageFlags.ImageCoherent)) - { - imageTypeName = "coherent " + imageTypeName; - } - - string layout = descriptor.Format.ToGlslFormat(); - - if (!string.IsNullOrEmpty(layout)) - { - layout = ", " + layout; - } - - if (context.Config.Options.TargetApi == TargetApi.Vulkan) - { - layout = $", set = 3{layout}"; - } - - context.AppendLine($"layout (binding = {descriptor.Binding}{layout}) uniform {imageTypeName} {imageName};"); - } - } - - private static void DeclareInputAttributes(CodeGenContext context, StructuredProgramInfo info) - { - if (context.Config.UsedFeatures.HasFlag(FeatureFlags.IaIndexing)) - { - string suffix = context.Config.Stage == ShaderStage.Geometry ? "[]" : string.Empty; - - context.AppendLine($"layout (location = 0) in vec4 {DefaultNames.IAttributePrefix}{suffix}[{Constants.MaxAttributes}];"); - } - else - { - int usedAttributes = context.Config.UsedInputAttributes | context.Config.PassthroughAttributes; - while (usedAttributes != 0) - { - int index = BitOperations.TrailingZeroCount(usedAttributes); - DeclareInputAttribute(context, info, index); - usedAttributes &= ~(1 << index); - } - } - } - - private static void DeclareInputAttributesPerPatch(CodeGenContext context, HashSet<int> attrs) - { - foreach (int attr in attrs.Order()) - { - DeclareInputAttributePerPatch(context, attr); - } - } - - private static void DeclareInputAttribute(CodeGenContext context, StructuredProgramInfo info, int attr) - { - string suffix = IsArrayAttributeGlsl(context.Config.Stage, isOutAttr: false) ? "[]" : string.Empty; - string iq = string.Empty; - - if (context.Config.Stage == ShaderStage.Fragment) - { - iq = context.Config.ImapTypes[attr].GetFirstUsedType() switch - { - PixelImap.Constant => "flat ", - PixelImap.ScreenLinear => "noperspective ", - _ => string.Empty - }; - } - - string name = $"{DefaultNames.IAttributePrefix}{attr}"; - - if (context.Config.TransformFeedbackEnabled && context.Config.Stage == ShaderStage.Fragment) - { - int components = context.Config.GetTransformFeedbackOutputComponents(attr, 0); - - if (components > 1) - { - string type = components switch - { - 2 => "vec2", - 3 => "vec3", - 4 => "vec4", - _ => "float" - }; - - context.AppendLine($"layout (location = {attr}) in {type} {name};"); - } - - for (int c = components > 1 ? components : 0; c < 4; c++) - { - char swzMask = "xyzw"[c]; - - context.AppendLine($"layout (location = {attr}, component = {c}) {iq}in float {name}_{swzMask}{suffix};"); - } - } - else - { - bool passthrough = (context.Config.PassthroughAttributes & (1 << attr)) != 0; - string pass = passthrough && context.Config.GpuAccessor.QueryHostSupportsGeometryShaderPassthrough() ? "passthrough, " : string.Empty; - string type; - - if (context.Config.Stage == ShaderStage.Vertex) - { - type = context.Config.GpuAccessor.QueryAttributeType(attr).ToVec4Type(); - } - else - { - type = AttributeType.Float.ToVec4Type(); - } - - context.AppendLine($"layout ({pass}location = {attr}) {iq}in {type} {name}{suffix};"); - } - } - - private static void DeclareInputAttributePerPatch(CodeGenContext context, int attr) - { - int location = context.Config.GetPerPatchAttributeLocation(attr); - string name = $"{DefaultNames.PerPatchAttributePrefix}{attr}"; - - context.AppendLine($"layout (location = {location}) patch in vec4 {name};"); - } - - private static void DeclareOutputAttributes(CodeGenContext context, StructuredProgramInfo info) - { - if (context.Config.UsedFeatures.HasFlag(FeatureFlags.OaIndexing)) - { - context.AppendLine($"layout (location = 0) out vec4 {DefaultNames.OAttributePrefix}[{Constants.MaxAttributes}];"); - } - else - { - int usedAttributes = context.Config.UsedOutputAttributes; - - if (context.Config.Stage == ShaderStage.Fragment && context.Config.GpuAccessor.QueryDualSourceBlendEnable()) - { - int firstOutput = BitOperations.TrailingZeroCount(usedAttributes); - int mask = 3 << firstOutput; - - if ((usedAttributes & mask) == mask) - { - usedAttributes &= ~mask; - DeclareOutputDualSourceBlendAttribute(context, firstOutput); - } - } - - while (usedAttributes != 0) - { - int index = BitOperations.TrailingZeroCount(usedAttributes); - DeclareOutputAttribute(context, index); - usedAttributes &= ~(1 << index); - } - } - } - - private static void DeclareOutputAttribute(CodeGenContext context, int attr) - { - string suffix = IsArrayAttributeGlsl(context.Config.Stage, isOutAttr: true) ? "[]" : string.Empty; - string name = $"{DefaultNames.OAttributePrefix}{attr}{suffix}"; - - if (context.Config.TransformFeedbackEnabled && context.Config.LastInVertexPipeline) - { - int components = context.Config.GetTransformFeedbackOutputComponents(attr, 0); - - if (components > 1) - { - string type = components switch - { - 2 => "vec2", - 3 => "vec3", - 4 => "vec4", - _ => "float" - }; - - string xfb = string.Empty; - - var tfOutput = context.Config.GetTransformFeedbackOutput(attr, 0); - if (tfOutput.Valid) - { - xfb = $", xfb_buffer = {tfOutput.Buffer}, xfb_offset = {tfOutput.Offset}, xfb_stride = {tfOutput.Stride}"; - } - - context.AppendLine($"layout (location = {attr}{xfb}) out {type} {name};"); - } - - for (int c = components > 1 ? components : 0; c < 4; c++) - { - char swzMask = "xyzw"[c]; - - string xfb = string.Empty; - - var tfOutput = context.Config.GetTransformFeedbackOutput(attr, c); - if (tfOutput.Valid) - { - xfb = $", xfb_buffer = {tfOutput.Buffer}, xfb_offset = {tfOutput.Offset}, xfb_stride = {tfOutput.Stride}"; - } - - context.AppendLine($"layout (location = {attr}, component = {c}{xfb}) out float {name}_{swzMask};"); - } - } - else - { - string type = context.Config.Stage != ShaderStage.Fragment ? "vec4" : - context.Config.GpuAccessor.QueryFragmentOutputType(attr) switch - { - AttributeType.Sint => "ivec4", - AttributeType.Uint => "uvec4", - _ => "vec4" - }; - - if (context.Config.GpuAccessor.QueryHostReducedPrecision() && context.Config.Stage == ShaderStage.Vertex && attr == 0) - { - context.AppendLine($"layout (location = {attr}) invariant out {type} {name};"); - } - else - { - context.AppendLine($"layout (location = {attr}) out {type} {name};"); - } - } - } - - private static void DeclareOutputDualSourceBlendAttribute(CodeGenContext context, int attr) - { - string name = $"{DefaultNames.OAttributePrefix}{attr}"; - string name2 = $"{DefaultNames.OAttributePrefix}{(attr + 1)}"; - - context.AppendLine($"layout (location = {attr}, index = 0) out vec4 {name};"); - context.AppendLine($"layout (location = {attr}, index = 1) out vec4 {name2};"); - } - - private static bool IsArrayAttributeGlsl(ShaderStage stage, bool isOutAttr) - { - if (isOutAttr) - { - return stage == ShaderStage.TessellationControl; - } - else - { - return stage == ShaderStage.TessellationControl || - stage == ShaderStage.TessellationEvaluation || - stage == ShaderStage.Geometry; - } - } - - private static void DeclareUsedOutputAttributesPerPatch(CodeGenContext context, HashSet<int> attrs) - { - foreach (int attr in attrs.Order()) - { - DeclareOutputAttributePerPatch(context, attr); - } - } - - private static void DeclareOutputAttributePerPatch(CodeGenContext context, int attr) - { - int location = context.Config.GetPerPatchAttributeLocation(attr); - string name = $"{DefaultNames.PerPatchAttributePrefix}{attr}"; - - context.AppendLine($"layout (location = {location}) patch out vec4 {name};"); - } - - private static void DeclareSupportUniformBlock(CodeGenContext context, ShaderStage stage, int scaleElements) - { - bool needsSupportBlock = stage == ShaderStage.Fragment || - (context.Config.LastInVertexPipeline && context.Config.GpuAccessor.QueryViewportTransformDisable()); - - if (!needsSupportBlock && scaleElements == 0) - { - return; - } - - context.AppendLine($"layout (binding = 0, std140) uniform {DefaultNames.SupportBlockName}"); - context.EnterScope(); - - switch (stage) - { - case ShaderStage.Fragment: - case ShaderStage.Vertex: - context.AppendLine($"uint {DefaultNames.SupportBlockAlphaTestName};"); - context.AppendLine($"bool {DefaultNames.SupportBlockIsBgraName}[{SupportBuffer.FragmentIsBgraCount}];"); - context.AppendLine($"vec4 {DefaultNames.SupportBlockViewportInverse};"); - context.AppendLine($"int {DefaultNames.SupportBlockFragmentScaleCount};"); - break; - case ShaderStage.Compute: - context.AppendLine($"uint s_reserved[{SupportBuffer.ComputeRenderScaleOffset / SupportBuffer.FieldSize}];"); - break; - } - - context.AppendLine($"float {DefaultNames.SupportBlockRenderScaleName}[{SupportBuffer.RenderScaleMaxCount}];"); - - context.LeaveScope(";"); - context.AppendLine(); - } - - private static void AppendHelperFunction(CodeGenContext context, string filename) - { - string code = EmbeddedResources.ReadAllText(filename); - - code = code.Replace("\t", CodeGenContext.Tab); - code = code.Replace("$SHARED_MEM$", DefaultNames.SharedMemoryName); - code = code.Replace("$STORAGE_MEM$", OperandManager.GetShaderStagePrefix(context.Config.Stage) + "_" + DefaultNames.StorageNamePrefix); - - if (context.Config.GpuAccessor.QueryHostSupportsShaderBallot()) - { - code = code.Replace("$SUBGROUP_INVOCATION$", "gl_SubGroupInvocationARB"); - code = code.Replace("$SUBGROUP_BROADCAST$", "readInvocationARB"); - } - else - { - code = code.Replace("$SUBGROUP_INVOCATION$", "gl_SubgroupInvocationID"); - code = code.Replace("$SUBGROUP_BROADCAST$", "subgroupBroadcast"); - } - - context.AppendLine(code); - context.AppendLine(); - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/DefaultNames.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/DefaultNames.cs deleted file mode 100644 index 3ab4814c..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/DefaultNames.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - static class DefaultNames - { - public const string LocalNamePrefix = "temp"; - - public const string SamplerNamePrefix = "tex"; - public const string ImageNamePrefix = "img"; - - public const string PerPatchAttributePrefix = "patch_attr_"; - public const string IAttributePrefix = "in_attr"; - public const string OAttributePrefix = "out_attr"; - - public const string StorageNamePrefix = "s"; - - public const string DataName = "data"; - - public const string SupportBlockName = "support_block"; - public const string SupportBlockAlphaTestName = "s_alpha_test"; - public const string SupportBlockIsBgraName = "s_is_bgra"; - public const string SupportBlockViewportInverse = "s_viewport_inverse"; - public const string SupportBlockFragmentScaleCount = "s_frag_scale_count"; - public const string SupportBlockRenderScaleName = "s_render_scale"; - - public const string BlockSuffix = "block"; - - public const string UniformNamePrefix = "c"; - public const string UniformNameSuffix = "data"; - - public const string LocalMemoryName = "local_mem"; - public const string SharedMemoryName = "shared_mem"; - - public const string ArgumentNamePrefix = "a"; - - public const string UndefinedName = "undef"; - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/GlslGenerator.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/GlslGenerator.cs deleted file mode 100644 index 751d0350..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/GlslGenerator.cs +++ /dev/null @@ -1,154 +0,0 @@ -using Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions; -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; -using System; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.TypeConversion; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - static class GlslGenerator - { - private const string MainFunctionName = "main"; - - public static string Generate(StructuredProgramInfo info, ShaderConfig config) - { - CodeGenContext context = new CodeGenContext(info, config); - - Declarations.Declare(context, info); - - if (info.Functions.Count != 0) - { - for (int i = 1; i < info.Functions.Count; i++) - { - context.AppendLine($"{GetFunctionSignature(context, info.Functions[i])};"); - } - - context.AppendLine(); - - for (int i = 1; i < info.Functions.Count; i++) - { - PrintFunction(context, info, info.Functions[i]); - - context.AppendLine(); - } - } - - PrintFunction(context, info, info.Functions[0], MainFunctionName); - - return context.GetCode(); - } - - private static void PrintFunction(CodeGenContext context, StructuredProgramInfo info, StructuredFunction function, string funcName = null) - { - context.CurrentFunction = function; - - context.AppendLine(GetFunctionSignature(context, function, funcName)); - context.EnterScope(); - - Declarations.DeclareLocals(context, function); - - PrintBlock(context, function.MainBlock); - - context.LeaveScope(); - } - - private static string GetFunctionSignature(CodeGenContext context, StructuredFunction function, string funcName = null) - { - string[] args = new string[function.InArguments.Length + function.OutArguments.Length]; - - for (int i = 0; i < function.InArguments.Length; i++) - { - args[i] = $"{Declarations.GetVarTypeName(context, function.InArguments[i])} {OperandManager.GetArgumentName(i)}"; - } - - for (int i = 0; i < function.OutArguments.Length; i++) - { - int j = i + function.InArguments.Length; - - args[j] = $"out {Declarations.GetVarTypeName(context, function.OutArguments[i])} {OperandManager.GetArgumentName(j)}"; - } - - return $"{Declarations.GetVarTypeName(context, function.ReturnType)} {funcName ?? function.Name}({string.Join(", ", args)})"; - } - - private static void PrintBlock(CodeGenContext context, AstBlock block) - { - AstBlockVisitor visitor = new AstBlockVisitor(block); - - visitor.BlockEntered += (sender, e) => - { - switch (e.Block.Type) - { - case AstBlockType.DoWhile: - context.AppendLine("do"); - break; - - case AstBlockType.Else: - context.AppendLine("else"); - break; - - case AstBlockType.ElseIf: - context.AppendLine($"else if ({GetCondExpr(context, e.Block.Condition)})"); - break; - - case AstBlockType.If: - context.AppendLine($"if ({GetCondExpr(context, e.Block.Condition)})"); - break; - - default: throw new InvalidOperationException($"Found unexpected block type \"{e.Block.Type}\"."); - } - - context.EnterScope(); - }; - - visitor.BlockLeft += (sender, e) => - { - context.LeaveScope(); - - if (e.Block.Type == AstBlockType.DoWhile) - { - context.AppendLine($"while ({GetCondExpr(context, e.Block.Condition)});"); - } - }; - - foreach (IAstNode node in visitor.Visit()) - { - if (node is AstOperation operation) - { - string expr = InstGen.GetExpression(context, operation); - - if (expr != null) - { - context.AppendLine(expr + ";"); - } - } - else if (node is AstAssignment assignment) - { - AggregateType dstType = OperandManager.GetNodeDestType(context, assignment.Destination); - AggregateType srcType = OperandManager.GetNodeDestType(context, assignment.Source); - - string dest = InstGen.GetExpression(context, assignment.Destination); - string src = ReinterpretCast(context, assignment.Source, srcType, dstType); - - context.AppendLine(dest + " = " + src + ";"); - } - else if (node is AstComment comment) - { - context.AppendLine("// " + comment.Comment); - } - else - { - throw new InvalidOperationException($"Found unexpected node type \"{node?.GetType().Name ?? "null"}\"."); - } - } - } - - private static string GetCondExpr(CodeGenContext context, IAstNode cond) - { - AggregateType srcType = OperandManager.GetNodeDestType(context, cond); - - return ReinterpretCast(context, cond, srcType, AggregateType.Bool); - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Shared.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Shared.glsl deleted file mode 100644 index 82b76bcc..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Shared.glsl +++ /dev/null @@ -1,21 +0,0 @@ -int Helper_AtomicMaxS32(int offset, int value) -{ - uint oldValue, newValue; - do - { - oldValue = $SHARED_MEM$[offset]; - newValue = uint(max(int(oldValue), value)); - } while (atomicCompSwap($SHARED_MEM$[offset], oldValue, newValue) != oldValue); - return int(oldValue); -} - -int Helper_AtomicMinS32(int offset, int value) -{ - uint oldValue, newValue; - do - { - oldValue = $SHARED_MEM$[offset]; - newValue = uint(min(int(oldValue), value)); - } while (atomicCompSwap($SHARED_MEM$[offset], oldValue, newValue) != oldValue); - return int(oldValue); -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Storage.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Storage.glsl deleted file mode 100644 index 0862a71b..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/AtomicMinMaxS32Storage.glsl +++ /dev/null @@ -1,21 +0,0 @@ -int Helper_AtomicMaxS32(int index, int offset, int value) -{ - uint oldValue, newValue; - do - { - oldValue = $STORAGE_MEM$[index].data[offset]; - newValue = uint(max(int(oldValue), value)); - } while (atomicCompSwap($STORAGE_MEM$[index].data[offset], oldValue, newValue) != oldValue); - return int(oldValue); -} - -int Helper_AtomicMinS32(int index, int offset, int value) -{ - uint oldValue, newValue; - do - { - oldValue = $STORAGE_MEM$[index].data[offset]; - newValue = uint(min(int(oldValue), value)); - } while (atomicCompSwap($STORAGE_MEM$[index].data[offset], oldValue, newValue) != oldValue); - return int(oldValue); -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/HelperFunctionNames.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/HelperFunctionNames.cs deleted file mode 100644 index 54f35b15..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/HelperFunctionNames.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - static class HelperFunctionNames - { - public static string AtomicMaxS32 = "Helper_AtomicMaxS32"; - public static string AtomicMinS32 = "Helper_AtomicMinS32"; - - public static string MultiplyHighS32 = "Helper_MultiplyHighS32"; - public static string MultiplyHighU32 = "Helper_MultiplyHighU32"; - - public static string Shuffle = "Helper_Shuffle"; - public static string ShuffleDown = "Helper_ShuffleDown"; - public static string ShuffleUp = "Helper_ShuffleUp"; - public static string ShuffleXor = "Helper_ShuffleXor"; - public static string SwizzleAdd = "Helper_SwizzleAdd"; - - public static string StoreShared16 = "Helper_StoreShared16"; - public static string StoreShared8 = "Helper_StoreShared8"; - public static string StoreStorage16 = "Helper_StoreStorage16"; - public static string StoreStorage8 = "Helper_StoreStorage8"; - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighS32.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighS32.glsl deleted file mode 100644 index caad6f56..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighS32.glsl +++ /dev/null @@ -1,7 +0,0 @@ -int Helper_MultiplyHighS32(int x, int y) -{ - int msb; - int lsb; - imulExtended(x, y, msb, lsb); - return msb; -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighU32.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighU32.glsl deleted file mode 100644 index 617a925f..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/MultiplyHighU32.glsl +++ /dev/null @@ -1,7 +0,0 @@ -uint Helper_MultiplyHighU32(uint x, uint y) -{ - uint msb; - uint lsb; - umulExtended(x, y, msb, lsb); - return msb; -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/Shuffle.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/Shuffle.glsl deleted file mode 100644 index 7cb4764d..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/Shuffle.glsl +++ /dev/null @@ -1,11 +0,0 @@ -float Helper_Shuffle(float x, uint index, uint mask, out bool valid) -{ - uint clamp = mask & 0x1fu; - uint segMask = (mask >> 8) & 0x1fu; - uint minThreadId = $SUBGROUP_INVOCATION$ & segMask; - uint maxThreadId = minThreadId | (clamp & ~segMask); - uint srcThreadId = (index & ~segMask) | minThreadId; - valid = srcThreadId <= maxThreadId; - float v = $SUBGROUP_BROADCAST$(x, srcThreadId); - return valid ? v : x; -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleDown.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleDown.glsl deleted file mode 100644 index 71d901d5..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleDown.glsl +++ /dev/null @@ -1,11 +0,0 @@ -float Helper_ShuffleDown(float x, uint index, uint mask, out bool valid) -{ - uint clamp = mask & 0x1fu; - uint segMask = (mask >> 8) & 0x1fu; - uint minThreadId = $SUBGROUP_INVOCATION$ & segMask; - uint maxThreadId = minThreadId | (clamp & ~segMask); - uint srcThreadId = $SUBGROUP_INVOCATION$ + index; - valid = srcThreadId <= maxThreadId; - float v = $SUBGROUP_BROADCAST$(x, srcThreadId); - return valid ? v : x; -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleUp.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleUp.glsl deleted file mode 100644 index ae264d87..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleUp.glsl +++ /dev/null @@ -1,9 +0,0 @@ -float Helper_ShuffleUp(float x, uint index, uint mask, out bool valid) -{ - uint segMask = (mask >> 8) & 0x1fu; - uint minThreadId = $SUBGROUP_INVOCATION$ & segMask; - uint srcThreadId = $SUBGROUP_INVOCATION$ - index; - valid = int(srcThreadId) >= int(minThreadId); - float v = $SUBGROUP_BROADCAST$(x, srcThreadId); - return valid ? v : x; -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleXor.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleXor.glsl deleted file mode 100644 index 789089d6..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/ShuffleXor.glsl +++ /dev/null @@ -1,11 +0,0 @@ -float Helper_ShuffleXor(float x, uint index, uint mask, out bool valid) -{ - uint clamp = mask & 0x1fu; - uint segMask = (mask >> 8) & 0x1fu; - uint minThreadId = $SUBGROUP_INVOCATION$ & segMask; - uint maxThreadId = minThreadId | (clamp & ~segMask); - uint srcThreadId = $SUBGROUP_INVOCATION$ ^ index; - valid = srcThreadId <= maxThreadId; - float v = $SUBGROUP_BROADCAST$(x, srcThreadId); - return valid ? v : x; -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreSharedSmallInt.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreSharedSmallInt.glsl deleted file mode 100644 index 2f57b5ff..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreSharedSmallInt.glsl +++ /dev/null @@ -1,23 +0,0 @@ -void Helper_StoreShared16(int offset, uint value) -{ - int wordOffset = offset >> 2; - int bitOffset = (offset & 3) * 8; - uint oldValue, newValue; - do - { - oldValue = $SHARED_MEM$[wordOffset]; - newValue = bitfieldInsert(oldValue, value, bitOffset, 16); - } while (atomicCompSwap($SHARED_MEM$[wordOffset], oldValue, newValue) != oldValue); -} - -void Helper_StoreShared8(int offset, uint value) -{ - int wordOffset = offset >> 2; - int bitOffset = (offset & 3) * 8; - uint oldValue, newValue; - do - { - oldValue = $SHARED_MEM$[wordOffset]; - newValue = bitfieldInsert(oldValue, value, bitOffset, 8); - } while (atomicCompSwap($SHARED_MEM$[wordOffset], oldValue, newValue) != oldValue); -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreStorageSmallInt.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreStorageSmallInt.glsl deleted file mode 100644 index f2253a79..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/StoreStorageSmallInt.glsl +++ /dev/null @@ -1,23 +0,0 @@ -void Helper_StoreStorage16(int index, int offset, uint value) -{ - int wordOffset = offset >> 2; - int bitOffset = (offset & 3) * 8; - uint oldValue, newValue; - do - { - oldValue = $STORAGE_MEM$[index].data[wordOffset]; - newValue = bitfieldInsert(oldValue, value, bitOffset, 16); - } while (atomicCompSwap($STORAGE_MEM$[index].data[wordOffset], oldValue, newValue) != oldValue); -} - -void Helper_StoreStorage8(int index, int offset, uint value) -{ - int wordOffset = offset >> 2; - int bitOffset = (offset & 3) * 8; - uint oldValue, newValue; - do - { - oldValue = $STORAGE_MEM$[index].data[wordOffset]; - newValue = bitfieldInsert(oldValue, value, bitOffset, 8); - } while (atomicCompSwap($STORAGE_MEM$[index].data[wordOffset], oldValue, newValue) != oldValue); -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/SwizzleAdd.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/SwizzleAdd.glsl deleted file mode 100644 index 057cb6ca..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/SwizzleAdd.glsl +++ /dev/null @@ -1,7 +0,0 @@ -float Helper_SwizzleAdd(float x, float y, int mask) -{ - vec4 xLut = vec4(1.0, -1.0, 1.0, 0.0); - vec4 yLut = vec4(1.0, 1.0, -1.0, 1.0); - int lutIdx = (mask >> (int($SUBGROUP_INVOCATION$ & 3u) * 2)) & 3; - return x * xLut[lutIdx] + y * yLut[lutIdx]; -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_cp.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_cp.glsl deleted file mode 100644 index 4ebade5e..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_cp.glsl +++ /dev/null @@ -1,19 +0,0 @@ -ivec2 Helper_TexelFetchScale(ivec2 inputVec, int samplerIndex) -{ - float scale = s_render_scale[samplerIndex]; - if (scale == 1.0) - { - return inputVec; - } - return ivec2(vec2(inputVec) * scale); -} - -int Helper_TextureSizeUnscale(int size, int samplerIndex) -{ - float scale = s_render_scale[samplerIndex]; - if (scale == 1.0) - { - return size; - } - return int(float(size) / scale); -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_fp.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_fp.glsl deleted file mode 100644 index 6c670f91..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_fp.glsl +++ /dev/null @@ -1,26 +0,0 @@ -ivec2 Helper_TexelFetchScale(ivec2 inputVec, int samplerIndex) -{ - float scale = s_render_scale[1 + samplerIndex]; - if (scale == 1.0) - { - return inputVec; - } - if (scale < 0.0) // If less than 0, try interpolate between texels by using the screen position. - { - return ivec2(vec2(inputVec) * (-scale) + mod(gl_FragCoord.xy, 0.0 - scale)); - } - else - { - return ivec2(vec2(inputVec) * scale); - } -} - -int Helper_TextureSizeUnscale(int size, int samplerIndex) -{ - float scale = abs(s_render_scale[1 + samplerIndex]); - if (scale == 1.0) - { - return size; - } - return int(float(size) / scale); -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_vp.glsl b/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_vp.glsl deleted file mode 100644 index 19eb119d..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/HelperFunctions/TexelFetchScale_vp.glsl +++ /dev/null @@ -1,20 +0,0 @@ -ivec2 Helper_TexelFetchScale(ivec2 inputVec, int samplerIndex) -{ - float scale = abs(s_render_scale[1 + samplerIndex + s_frag_scale_count]); - if (scale == 1.0) - { - return inputVec; - } - - return ivec2(vec2(inputVec) * scale); -} - -int Helper_TextureSizeUnscale(int size, int samplerIndex) -{ - float scale = abs(s_render_scale[1 + samplerIndex + s_frag_scale_count]); - if (scale == 1.0) - { - return size; - } - return int(float(size) / scale); -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs deleted file mode 100644 index 01bd11e5..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs +++ /dev/null @@ -1,238 +0,0 @@ -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; -using System; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenBallot; -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenCall; -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenFSI; -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper; -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenMemory; -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenPacking; -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenVector; -using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGen - { - public static string GetExpression(CodeGenContext context, IAstNode node) - { - if (node is AstOperation operation) - { - return GetExpression(context, operation); - } - else if (node is AstOperand operand) - { - return context.OperandManager.GetExpression(context, operand); - } - - throw new ArgumentException($"Invalid node type \"{node?.GetType().Name ?? "null"}\"."); - } - - public static string Negate(CodeGenContext context, AstOperation operation, InstInfo info) - { - IAstNode src = operation.GetSource(0); - - AggregateType type = GetSrcVarType(operation.Inst, 0); - - string srcExpr = GetSoureExpr(context, src, type); - string zero; - - if (type == AggregateType.FP64) - { - zero = "0.0"; - } - else - { - NumberFormatter.TryFormat(0, type, out zero); - } - - // Starting in the 496.13 NVIDIA driver, there's an issue with assigning variables to negated expressions. - // (-expr) does not work, but (0.0 - expr) does. This should be removed once the issue is resolved. - - return $"{zero} - {Enclose(srcExpr, src, operation.Inst, info, false)}"; - } - - private static string GetExpression(CodeGenContext context, AstOperation operation) - { - Instruction inst = operation.Inst; - - InstInfo info = GetInstructionInfo(inst); - - if ((info.Type & InstType.Call) != 0) - { - bool atomic = (info.Type & InstType.Atomic) != 0; - - int arity = (int)(info.Type & InstType.ArityMask); - - string args = string.Empty; - - for (int argIndex = 0; argIndex < arity; argIndex++) - { - // For shared memory access, the second argument is unused and should be ignored. - // It is there to make both storage and shared access have the same number of arguments. - // For storage, both inputs are consumed when the argument index is 0, so we should skip it here. - if (argIndex == 1 && (atomic || operation.StorageKind == StorageKind.SharedMemory)) - { - continue; - } - - if (argIndex != 0) - { - args += ", "; - } - - if (argIndex == 0 && atomic) - { - switch (operation.StorageKind) - { - case StorageKind.SharedMemory: args += LoadShared(context, operation); break; - case StorageKind.StorageBuffer: args += LoadStorage(context, operation); break; - - default: throw new InvalidOperationException($"Invalid storage kind \"{operation.StorageKind}\"."); - } - } - else - { - AggregateType dstType = GetSrcVarType(inst, argIndex); - - args += GetSoureExpr(context, operation.GetSource(argIndex), dstType); - } - } - - return info.OpName + '(' + args + ')'; - } - else if ((info.Type & InstType.Op) != 0) - { - string op = info.OpName; - - // Return may optionally have a return value (and in this case it is unary). - if (inst == Instruction.Return && operation.SourcesCount != 0) - { - return $"{op} {GetSoureExpr(context, operation.GetSource(0), context.CurrentFunction.ReturnType)}"; - } - - int arity = (int)(info.Type & InstType.ArityMask); - - string[] expr = new string[arity]; - - for (int index = 0; index < arity; index++) - { - IAstNode src = operation.GetSource(index); - - string srcExpr = GetSoureExpr(context, src, GetSrcVarType(inst, index)); - - bool isLhs = arity == 2 && index == 0; - - expr[index] = Enclose(srcExpr, src, inst, info, isLhs); - } - - switch (arity) - { - case 0: - return op; - - case 1: - return op + expr[0]; - - case 2: - return $"{expr[0]} {op} {expr[1]}"; - - case 3: - return $"{expr[0]} {op[0]} {expr[1]} {op[1]} {expr[2]}"; - } - } - else if ((info.Type & InstType.Special) != 0) - { - switch (inst & Instruction.Mask) - { - case Instruction.Ballot: - return Ballot(context, operation); - - case Instruction.Call: - return Call(context, operation); - - case Instruction.FSIBegin: - return FSIBegin(context); - - case Instruction.FSIEnd: - return FSIEnd(context); - - case Instruction.ImageLoad: - case Instruction.ImageStore: - case Instruction.ImageAtomic: - return ImageLoadOrStore(context, operation); - - case Instruction.Load: - return Load(context, operation); - - case Instruction.LoadConstant: - return LoadConstant(context, operation); - - case Instruction.LoadLocal: - return LoadLocal(context, operation); - - case Instruction.LoadShared: - return LoadShared(context, operation); - - case Instruction.LoadStorage: - return LoadStorage(context, operation); - - case Instruction.Lod: - return Lod(context, operation); - - case Instruction.Negate: - return Negate(context, operation, info); - - case Instruction.PackDouble2x32: - return PackDouble2x32(context, operation); - - case Instruction.PackHalf2x16: - return PackHalf2x16(context, operation); - - case Instruction.Store: - return Store(context, operation); - - case Instruction.StoreLocal: - return StoreLocal(context, operation); - - case Instruction.StoreShared: - return StoreShared(context, operation); - - case Instruction.StoreShared16: - return StoreShared16(context, operation); - - case Instruction.StoreShared8: - return StoreShared8(context, operation); - - case Instruction.StoreStorage: - return StoreStorage(context, operation); - - case Instruction.StoreStorage16: - return StoreStorage16(context, operation); - - case Instruction.StoreStorage8: - return StoreStorage8(context, operation); - - case Instruction.TextureSample: - return TextureSample(context, operation); - - case Instruction.TextureSize: - return TextureSize(context, operation); - - case Instruction.UnpackDouble2x32: - return UnpackDouble2x32(context, operation); - - case Instruction.UnpackHalf2x16: - return UnpackHalf2x16(context, operation); - - case Instruction.VectorExtract: - return VectorExtract(context, operation); - } - } - - throw new InvalidOperationException($"Unexpected instruction type \"{info.Type}\"."); - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenBallot.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenBallot.cs deleted file mode 100644 index 68793c5d..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenBallot.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper; -using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGenBallot - { - public static string Ballot(CodeGenContext context, AstOperation operation) - { - AggregateType dstType = GetSrcVarType(operation.Inst, 0); - - string arg = GetSoureExpr(context, operation.GetSource(0), dstType); - - if (context.Config.GpuAccessor.QueryHostSupportsShaderBallot()) - { - return $"unpackUint2x32(ballotARB({arg})).x"; - } - else - { - return $"subgroupBallot({arg}).x"; - } - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenCall.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenCall.cs deleted file mode 100644 index 2df6960d..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenCall.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.StructuredIr; -using System.Diagnostics; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGenCall - { - public static string Call(CodeGenContext context, AstOperation operation) - { - AstOperand funcId = (AstOperand)operation.GetSource(0); - - Debug.Assert(funcId.Type == OperandType.Constant); - - var function = context.GetFunction(funcId.Value); - - string[] args = new string[operation.SourcesCount - 1]; - - for (int i = 0; i < args.Length; i++) - { - args[i] = GetSoureExpr(context, operation.GetSource(i + 1), function.GetArgumentType(i)); - } - - return $"{function.Name}({string.Join(", ", args)})"; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenFSI.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenFSI.cs deleted file mode 100644 index f61a53cb..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenFSI.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGenFSI - { - public static string FSIBegin(CodeGenContext context) - { - if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderInterlock()) - { - return "beginInvocationInterlockARB()"; - } - else if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderOrderingIntel()) - { - return "beginFragmentShaderOrderingINTEL()"; - } - - return null; - } - - public static string FSIEnd(CodeGenContext context) - { - if (context.Config.GpuAccessor.QueryHostSupportsFragmentShaderInterlock()) - { - return "endInvocationInterlockARB()"; - } - - return null; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenHelper.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenHelper.cs deleted file mode 100644 index 00478f6a..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenHelper.cs +++ /dev/null @@ -1,231 +0,0 @@ -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.TypeConversion; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGenHelper - { - private static readonly InstInfo[] _infoTable; - - static InstGenHelper() - { - _infoTable = new InstInfo[(int)Instruction.Count]; - - Add(Instruction.AtomicAdd, InstType.AtomicBinary, "atomicAdd"); - Add(Instruction.AtomicAnd, InstType.AtomicBinary, "atomicAnd"); - Add(Instruction.AtomicCompareAndSwap, InstType.AtomicTernary, "atomicCompSwap"); - Add(Instruction.AtomicMaxS32, InstType.CallTernary, HelperFunctionNames.AtomicMaxS32); - Add(Instruction.AtomicMaxU32, InstType.AtomicBinary, "atomicMax"); - Add(Instruction.AtomicMinS32, InstType.CallTernary, HelperFunctionNames.AtomicMinS32); - Add(Instruction.AtomicMinU32, InstType.AtomicBinary, "atomicMin"); - Add(Instruction.AtomicOr, InstType.AtomicBinary, "atomicOr"); - Add(Instruction.AtomicSwap, InstType.AtomicBinary, "atomicExchange"); - Add(Instruction.AtomicXor, InstType.AtomicBinary, "atomicXor"); - Add(Instruction.Absolute, InstType.CallUnary, "abs"); - Add(Instruction.Add, InstType.OpBinaryCom, "+", 2); - Add(Instruction.Ballot, InstType.Special); - Add(Instruction.Barrier, InstType.CallNullary, "barrier"); - Add(Instruction.BitCount, InstType.CallUnary, "bitCount"); - Add(Instruction.BitfieldExtractS32, InstType.CallTernary, "bitfieldExtract"); - Add(Instruction.BitfieldExtractU32, InstType.CallTernary, "bitfieldExtract"); - Add(Instruction.BitfieldInsert, InstType.CallQuaternary, "bitfieldInsert"); - Add(Instruction.BitfieldReverse, InstType.CallUnary, "bitfieldReverse"); - Add(Instruction.BitwiseAnd, InstType.OpBinaryCom, "&", 6); - Add(Instruction.BitwiseExclusiveOr, InstType.OpBinaryCom, "^", 7); - Add(Instruction.BitwiseNot, InstType.OpUnary, "~", 0); - Add(Instruction.BitwiseOr, InstType.OpBinaryCom, "|", 8); - Add(Instruction.Call, InstType.Special); - Add(Instruction.Ceiling, InstType.CallUnary, "ceil"); - Add(Instruction.Clamp, InstType.CallTernary, "clamp"); - Add(Instruction.ClampU32, InstType.CallTernary, "clamp"); - Add(Instruction.CompareEqual, InstType.OpBinaryCom, "==", 5); - Add(Instruction.CompareGreater, InstType.OpBinary, ">", 4); - Add(Instruction.CompareGreaterOrEqual, InstType.OpBinary, ">=", 4); - Add(Instruction.CompareGreaterOrEqualU32, InstType.OpBinary, ">=", 4); - Add(Instruction.CompareGreaterU32, InstType.OpBinary, ">", 4); - Add(Instruction.CompareLess, InstType.OpBinary, "<", 4); - Add(Instruction.CompareLessOrEqual, InstType.OpBinary, "<=", 4); - Add(Instruction.CompareLessOrEqualU32, InstType.OpBinary, "<=", 4); - Add(Instruction.CompareLessU32, InstType.OpBinary, "<", 4); - Add(Instruction.CompareNotEqual, InstType.OpBinaryCom, "!=", 5); - Add(Instruction.ConditionalSelect, InstType.OpTernary, "?:", 12); - Add(Instruction.ConvertFP32ToFP64, InstType.CallUnary, "double"); - Add(Instruction.ConvertFP64ToFP32, InstType.CallUnary, "float"); - Add(Instruction.ConvertFP32ToS32, InstType.CallUnary, "int"); - Add(Instruction.ConvertFP32ToU32, InstType.CallUnary, "uint"); - Add(Instruction.ConvertFP64ToS32, InstType.CallUnary, "int"); - Add(Instruction.ConvertFP64ToU32, InstType.CallUnary, "uint"); - Add(Instruction.ConvertS32ToFP32, InstType.CallUnary, "float"); - Add(Instruction.ConvertS32ToFP64, InstType.CallUnary, "double"); - Add(Instruction.ConvertU32ToFP32, InstType.CallUnary, "float"); - Add(Instruction.ConvertU32ToFP64, InstType.CallUnary, "double"); - Add(Instruction.Cosine, InstType.CallUnary, "cos"); - Add(Instruction.Ddx, InstType.CallUnary, "dFdx"); - Add(Instruction.Ddy, InstType.CallUnary, "dFdy"); - Add(Instruction.Discard, InstType.OpNullary, "discard"); - Add(Instruction.Divide, InstType.OpBinary, "/", 1); - Add(Instruction.EmitVertex, InstType.CallNullary, "EmitVertex"); - Add(Instruction.EndPrimitive, InstType.CallNullary, "EndPrimitive"); - Add(Instruction.ExponentB2, InstType.CallUnary, "exp2"); - Add(Instruction.FSIBegin, InstType.Special); - Add(Instruction.FSIEnd, InstType.Special); - Add(Instruction.FindLSB, InstType.CallUnary, "findLSB"); - Add(Instruction.FindMSBS32, InstType.CallUnary, "findMSB"); - Add(Instruction.FindMSBU32, InstType.CallUnary, "findMSB"); - Add(Instruction.Floor, InstType.CallUnary, "floor"); - Add(Instruction.FusedMultiplyAdd, InstType.CallTernary, "fma"); - Add(Instruction.GroupMemoryBarrier, InstType.CallNullary, "groupMemoryBarrier"); - Add(Instruction.ImageLoad, InstType.Special); - Add(Instruction.ImageStore, InstType.Special); - Add(Instruction.ImageAtomic, InstType.Special); - Add(Instruction.IsNan, InstType.CallUnary, "isnan"); - Add(Instruction.Load, InstType.Special); - Add(Instruction.LoadConstant, InstType.Special); - Add(Instruction.LoadLocal, InstType.Special); - Add(Instruction.LoadShared, InstType.Special); - Add(Instruction.LoadStorage, InstType.Special); - Add(Instruction.Lod, InstType.Special); - Add(Instruction.LogarithmB2, InstType.CallUnary, "log2"); - Add(Instruction.LogicalAnd, InstType.OpBinaryCom, "&&", 9); - Add(Instruction.LogicalExclusiveOr, InstType.OpBinaryCom, "^^", 10); - Add(Instruction.LogicalNot, InstType.OpUnary, "!", 0); - Add(Instruction.LogicalOr, InstType.OpBinaryCom, "||", 11); - Add(Instruction.LoopBreak, InstType.OpNullary, "break"); - Add(Instruction.LoopContinue, InstType.OpNullary, "continue"); - Add(Instruction.PackDouble2x32, InstType.Special); - Add(Instruction.PackHalf2x16, InstType.Special); - Add(Instruction.Maximum, InstType.CallBinary, "max"); - Add(Instruction.MaximumU32, InstType.CallBinary, "max"); - Add(Instruction.MemoryBarrier, InstType.CallNullary, "memoryBarrier"); - Add(Instruction.Minimum, InstType.CallBinary, "min"); - Add(Instruction.MinimumU32, InstType.CallBinary, "min"); - Add(Instruction.Multiply, InstType.OpBinaryCom, "*", 1); - Add(Instruction.MultiplyHighS32, InstType.CallBinary, HelperFunctionNames.MultiplyHighS32); - Add(Instruction.MultiplyHighU32, InstType.CallBinary, HelperFunctionNames.MultiplyHighU32); - Add(Instruction.Negate, InstType.Special); - Add(Instruction.ReciprocalSquareRoot, InstType.CallUnary, "inversesqrt"); - Add(Instruction.Return, InstType.OpNullary, "return"); - Add(Instruction.Round, InstType.CallUnary, "roundEven"); - Add(Instruction.ShiftLeft, InstType.OpBinary, "<<", 3); - Add(Instruction.ShiftRightS32, InstType.OpBinary, ">>", 3); - Add(Instruction.ShiftRightU32, InstType.OpBinary, ">>", 3); - Add(Instruction.Shuffle, InstType.CallQuaternary, HelperFunctionNames.Shuffle); - Add(Instruction.ShuffleDown, InstType.CallQuaternary, HelperFunctionNames.ShuffleDown); - Add(Instruction.ShuffleUp, InstType.CallQuaternary, HelperFunctionNames.ShuffleUp); - Add(Instruction.ShuffleXor, InstType.CallQuaternary, HelperFunctionNames.ShuffleXor); - Add(Instruction.Sine, InstType.CallUnary, "sin"); - Add(Instruction.SquareRoot, InstType.CallUnary, "sqrt"); - Add(Instruction.Store, InstType.Special); - Add(Instruction.StoreLocal, InstType.Special); - Add(Instruction.StoreShared, InstType.Special); - Add(Instruction.StoreShared16, InstType.Special); - Add(Instruction.StoreShared8, InstType.Special); - Add(Instruction.StoreStorage, InstType.Special); - Add(Instruction.StoreStorage16, InstType.Special); - Add(Instruction.StoreStorage8, InstType.Special); - Add(Instruction.Subtract, InstType.OpBinary, "-", 2); - Add(Instruction.SwizzleAdd, InstType.CallTernary, HelperFunctionNames.SwizzleAdd); - Add(Instruction.TextureSample, InstType.Special); - Add(Instruction.TextureSize, InstType.Special); - Add(Instruction.Truncate, InstType.CallUnary, "trunc"); - Add(Instruction.UnpackDouble2x32, InstType.Special); - Add(Instruction.UnpackHalf2x16, InstType.Special); - Add(Instruction.VectorExtract, InstType.Special); - Add(Instruction.VoteAll, InstType.CallUnary, "allInvocationsARB"); - Add(Instruction.VoteAllEqual, InstType.CallUnary, "allInvocationsEqualARB"); - Add(Instruction.VoteAny, InstType.CallUnary, "anyInvocationARB"); - } - - private static void Add(Instruction inst, InstType flags, string opName = null, int precedence = 0) - { - _infoTable[(int)inst] = new InstInfo(flags, opName, precedence); - } - - public static InstInfo GetInstructionInfo(Instruction inst) - { - return _infoTable[(int)(inst & Instruction.Mask)]; - } - - public static string GetSoureExpr(CodeGenContext context, IAstNode node, AggregateType dstType) - { - return ReinterpretCast(context, node, OperandManager.GetNodeDestType(context, node), dstType); - } - - public static string Enclose(string expr, IAstNode node, Instruction pInst, bool isLhs) - { - InstInfo pInfo = GetInstructionInfo(pInst); - - return Enclose(expr, node, pInst, pInfo, isLhs); - } - - public static string Enclose(string expr, IAstNode node, Instruction pInst, InstInfo pInfo, bool isLhs = false) - { - if (NeedsParenthesis(node, pInst, pInfo, isLhs)) - { - expr = "(" + expr + ")"; - } - - return expr; - } - - public static bool NeedsParenthesis(IAstNode node, Instruction pInst, InstInfo pInfo, bool isLhs) - { - // If the node isn't a operation, then it can only be a operand, - // and those never needs to be surrounded in parenthesis. - if (!(node is AstOperation operation)) - { - // This is sort of a special case, if this is a negative constant, - // and it is consumed by a unary operation, we need to put on the parenthesis, - // as in GLSL a sequence like --2 or ~-1 is not valid. - if (IsNegativeConst(node) && pInfo.Type == InstType.OpUnary) - { - return true; - } - - return false; - } - - if ((pInfo.Type & (InstType.Call | InstType.Special)) != 0) - { - return false; - } - - InstInfo info = _infoTable[(int)(operation.Inst & Instruction.Mask)]; - - if ((info.Type & (InstType.Call | InstType.Special)) != 0) - { - return false; - } - - if (info.Precedence < pInfo.Precedence) - { - return false; - } - - if (info.Precedence == pInfo.Precedence && isLhs) - { - return false; - } - - if (pInst == operation.Inst && info.Type == InstType.OpBinaryCom) - { - return false; - } - - return true; - } - - private static bool IsNegativeConst(IAstNode node) - { - if (!(node is AstOperand operand)) - { - return false; - } - - return operand.Type == OperandType.Constant && operand.Value < 0; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs deleted file mode 100644 index 99519837..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenMemory.cs +++ /dev/null @@ -1,939 +0,0 @@ -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; -using System; -using System.Text; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper; -using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGenMemory - { - public static string ImageLoadOrStore(CodeGenContext context, AstOperation operation) - { - AstTextureOperation texOp = (AstTextureOperation)operation; - - bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0; - - // TODO: Bindless texture support. For now we just return 0/do nothing. - if (isBindless) - { - switch (texOp.Inst) - { - case Instruction.ImageStore: - return "// imageStore(bindless)"; - case Instruction.ImageLoad: - AggregateType componentType = texOp.Format.GetComponentType(); - - NumberFormatter.TryFormat(0, componentType, out string imageConst); - - AggregateType outputType = texOp.GetVectorType(componentType); - - if ((outputType & AggregateType.ElementCountMask) != 0) - { - return $"{Declarations.GetVarTypeName(context, outputType, precise: false)}({imageConst})"; - } - - return imageConst; - default: - return NumberFormatter.FormatInt(0); - } - } - - bool isArray = (texOp.Type & SamplerType.Array) != 0; - bool isIndexed = (texOp.Type & SamplerType.Indexed) != 0; - - var texCallBuilder = new StringBuilder(); - - if (texOp.Inst == Instruction.ImageAtomic) - { - texCallBuilder.Append((texOp.Flags & TextureFlags.AtomicMask) switch { - TextureFlags.Add => "imageAtomicAdd", - TextureFlags.Minimum => "imageAtomicMin", - TextureFlags.Maximum => "imageAtomicMax", - TextureFlags.Increment => "imageAtomicAdd", // TODO: Clamp value. - TextureFlags.Decrement => "imageAtomicAdd", // TODO: Clamp value. - TextureFlags.BitwiseAnd => "imageAtomicAnd", - TextureFlags.BitwiseOr => "imageAtomicOr", - TextureFlags.BitwiseXor => "imageAtomicXor", - TextureFlags.Swap => "imageAtomicExchange", - TextureFlags.CAS => "imageAtomicCompSwap", - _ => "imageAtomicAdd", - }); - } - else - { - texCallBuilder.Append(texOp.Inst == Instruction.ImageLoad ? "imageLoad" : "imageStore"); - } - - int srcIndex = isBindless ? 1 : 0; - - string Src(AggregateType type) - { - return GetSoureExpr(context, texOp.GetSource(srcIndex++), type); - } - - string indexExpr = null; - - if (isIndexed) - { - indexExpr = Src(AggregateType.S32); - } - - string imageName = OperandManager.GetImageName(context.Config.Stage, texOp, indexExpr); - - texCallBuilder.Append('('); - texCallBuilder.Append(imageName); - - int coordsCount = texOp.Type.GetDimensions(); - - int pCount = coordsCount + (isArray ? 1 : 0); - - void Append(string str) - { - texCallBuilder.Append(", "); - texCallBuilder.Append(str); - } - - string ApplyScaling(string vector) - { - if (context.Config.Stage.SupportsRenderScale() && - texOp.Inst == Instruction.ImageLoad && - !isBindless && - !isIndexed) - { - // Image scales start after texture ones. - int scaleIndex = context.Config.GetTextureDescriptors().Length + context.Config.FindImageDescriptorIndex(texOp); - - if (pCount == 3 && isArray) - { - // The array index is not scaled, just x and y. - vector = $"ivec3(Helper_TexelFetchScale(({vector}).xy, {scaleIndex}), ({vector}).z)"; - } - else if (pCount == 2 && !isArray) - { - vector = $"Helper_TexelFetchScale({vector}, {scaleIndex})"; - } - } - - return vector; - } - - if (pCount > 1) - { - string[] elems = new string[pCount]; - - for (int index = 0; index < pCount; index++) - { - elems[index] = Src(AggregateType.S32); - } - - Append(ApplyScaling($"ivec{pCount}({string.Join(", ", elems)})")); - } - else - { - Append(Src(AggregateType.S32)); - } - - if (texOp.Inst == Instruction.ImageStore) - { - AggregateType type = texOp.Format.GetComponentType(); - - string[] cElems = new string[4]; - - for (int index = 0; index < 4; index++) - { - if (srcIndex < texOp.SourcesCount) - { - cElems[index] = Src(type); - } - else - { - cElems[index] = type switch - { - AggregateType.S32 => NumberFormatter.FormatInt(0), - AggregateType.U32 => NumberFormatter.FormatUint(0), - _ => NumberFormatter.FormatFloat(0) - }; - } - } - - string prefix = type switch - { - AggregateType.S32 => "i", - AggregateType.U32 => "u", - _ => string.Empty - }; - - Append($"{prefix}vec4({string.Join(", ", cElems)})"); - } - - if (texOp.Inst == Instruction.ImageAtomic) - { - AggregateType type = texOp.Format.GetComponentType(); - - if ((texOp.Flags & TextureFlags.AtomicMask) == TextureFlags.CAS) - { - Append(Src(type)); // Compare value. - } - - string value = (texOp.Flags & TextureFlags.AtomicMask) switch - { - TextureFlags.Increment => NumberFormatter.FormatInt(1, type), // TODO: Clamp value - TextureFlags.Decrement => NumberFormatter.FormatInt(-1, type), // TODO: Clamp value - _ => Src(type) - }; - - Append(value); - - texCallBuilder.Append(')'); - - if (type != AggregateType.S32) - { - texCallBuilder - .Insert(0, "int(") - .Append(')'); - } - } - else - { - texCallBuilder.Append(')'); - - if (texOp.Inst == Instruction.ImageLoad) - { - texCallBuilder.Append(GetMaskMultiDest(texOp.Index)); - } - } - - return texCallBuilder.ToString(); - } - - public static string Load(CodeGenContext context, AstOperation operation) - { - return GenerateLoadOrStore(context, operation, isStore: false); - } - - public static string LoadConstant(CodeGenContext context, AstOperation operation) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - - string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1)); - offsetExpr = Enclose(offsetExpr, src2, Instruction.ShiftRightS32, isLhs: true); - - var config = context.Config; - bool indexElement = !config.GpuAccessor.QueryHostHasVectorIndexingBug(); - - if (src1 is AstOperand operand && operand.Type == OperandType.Constant) - { - bool cbIndexable = config.UsedFeatures.HasFlag(Translation.FeatureFlags.CbIndexing); - return OperandManager.GetConstantBufferName(operand.Value, offsetExpr, config.Stage, cbIndexable, indexElement); - } - else - { - string slotExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - return OperandManager.GetConstantBufferName(slotExpr, offsetExpr, config.Stage, indexElement); - } - } - - public static string LoadLocal(CodeGenContext context, AstOperation operation) - { - return LoadLocalOrShared(context, operation, DefaultNames.LocalMemoryName); - } - - public static string LoadShared(CodeGenContext context, AstOperation operation) - { - return LoadLocalOrShared(context, operation, DefaultNames.SharedMemoryName); - } - - private static string LoadLocalOrShared(CodeGenContext context, AstOperation operation, string arrayName) - { - IAstNode src1 = operation.GetSource(0); - - string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - - return $"{arrayName}[{offsetExpr}]"; - } - - public static string LoadStorage(CodeGenContext context, AstOperation operation) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - - string indexExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1)); - - return GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage); - } - - public static string Lod(CodeGenContext context, AstOperation operation) - { - AstTextureOperation texOp = (AstTextureOperation)operation; - - int coordsCount = texOp.Type.GetDimensions(); - - bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0; - - // TODO: Bindless texture support. For now we just return 0. - if (isBindless) - { - return NumberFormatter.FormatFloat(0); - } - - bool isIndexed = (texOp.Type & SamplerType.Indexed) != 0; - - string indexExpr = null; - - if (isIndexed) - { - indexExpr = GetSoureExpr(context, texOp.GetSource(0), AggregateType.S32); - } - - string samplerName = OperandManager.GetSamplerName(context.Config.Stage, texOp, indexExpr); - - int coordsIndex = isBindless || isIndexed ? 1 : 0; - - string coordsExpr; - - if (coordsCount > 1) - { - string[] elems = new string[coordsCount]; - - for (int index = 0; index < coordsCount; index++) - { - elems[index] = GetSoureExpr(context, texOp.GetSource(coordsIndex + index), AggregateType.FP32); - } - - coordsExpr = "vec" + coordsCount + "(" + string.Join(", ", elems) + ")"; - } - else - { - coordsExpr = GetSoureExpr(context, texOp.GetSource(coordsIndex), AggregateType.FP32); - } - - return $"textureQueryLod({samplerName}, {coordsExpr}){GetMask(texOp.Index)}"; - } - - public static string Store(CodeGenContext context, AstOperation operation) - { - return GenerateLoadOrStore(context, operation, isStore: true); - } - - public static string StoreLocal(CodeGenContext context, AstOperation operation) - { - return StoreLocalOrShared(context, operation, DefaultNames.LocalMemoryName); - } - - public static string StoreShared(CodeGenContext context, AstOperation operation) - { - return StoreLocalOrShared(context, operation, DefaultNames.SharedMemoryName); - } - - private static string StoreLocalOrShared(CodeGenContext context, AstOperation operation, string arrayName) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - - string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - - AggregateType srcType = OperandManager.GetNodeDestType(context, src2); - - string src = TypeConversion.ReinterpretCast(context, src2, srcType, AggregateType.U32); - - return $"{arrayName}[{offsetExpr}] = {src}"; - } - - public static string StoreShared16(CodeGenContext context, AstOperation operation) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - - string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - - AggregateType srcType = OperandManager.GetNodeDestType(context, src2); - - string src = TypeConversion.ReinterpretCast(context, src2, srcType, AggregateType.U32); - - return $"{HelperFunctionNames.StoreShared16}({offsetExpr}, {src})"; - } - - public static string StoreShared8(CodeGenContext context, AstOperation operation) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - - string offsetExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - - AggregateType srcType = OperandManager.GetNodeDestType(context, src2); - - string src = TypeConversion.ReinterpretCast(context, src2, srcType, AggregateType.U32); - - return $"{HelperFunctionNames.StoreShared8}({offsetExpr}, {src})"; - } - - public static string StoreStorage(CodeGenContext context, AstOperation operation) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - IAstNode src3 = operation.GetSource(2); - - string indexExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1)); - - AggregateType srcType = OperandManager.GetNodeDestType(context, src3); - - string src = TypeConversion.ReinterpretCast(context, src3, srcType, AggregateType.U32); - - string sb = GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage); - - return $"{sb} = {src}"; - } - - public static string StoreStorage16(CodeGenContext context, AstOperation operation) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - IAstNode src3 = operation.GetSource(2); - - string indexExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1)); - - AggregateType srcType = OperandManager.GetNodeDestType(context, src3); - - string src = TypeConversion.ReinterpretCast(context, src3, srcType, AggregateType.U32); - - string sb = GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage); - - return $"{HelperFunctionNames.StoreStorage16}({indexExpr}, {offsetExpr}, {src})"; - } - - public static string StoreStorage8(CodeGenContext context, AstOperation operation) - { - IAstNode src1 = operation.GetSource(0); - IAstNode src2 = operation.GetSource(1); - IAstNode src3 = operation.GetSource(2); - - string indexExpr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 0)); - string offsetExpr = GetSoureExpr(context, src2, GetSrcVarType(operation.Inst, 1)); - - AggregateType srcType = OperandManager.GetNodeDestType(context, src3); - - string src = TypeConversion.ReinterpretCast(context, src3, srcType, AggregateType.U32); - - string sb = GetStorageBufferAccessor(indexExpr, offsetExpr, context.Config.Stage); - - return $"{HelperFunctionNames.StoreStorage8}({indexExpr}, {offsetExpr}, {src})"; - } - - public static string TextureSample(CodeGenContext context, AstOperation operation) - { - AstTextureOperation texOp = (AstTextureOperation)operation; - - bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0; - bool isGather = (texOp.Flags & TextureFlags.Gather) != 0; - bool hasDerivatives = (texOp.Flags & TextureFlags.Derivatives) != 0; - bool intCoords = (texOp.Flags & TextureFlags.IntCoords) != 0; - bool hasLodBias = (texOp.Flags & TextureFlags.LodBias) != 0; - bool hasLodLevel = (texOp.Flags & TextureFlags.LodLevel) != 0; - bool hasOffset = (texOp.Flags & TextureFlags.Offset) != 0; - bool hasOffsets = (texOp.Flags & TextureFlags.Offsets) != 0; - - bool isArray = (texOp.Type & SamplerType.Array) != 0; - bool isIndexed = (texOp.Type & SamplerType.Indexed) != 0; - bool isMultisample = (texOp.Type & SamplerType.Multisample) != 0; - bool isShadow = (texOp.Type & SamplerType.Shadow) != 0; - - bool colorIsVector = isGather || !isShadow; - - SamplerType type = texOp.Type & SamplerType.Mask; - - bool is2D = type == SamplerType.Texture2D; - bool isCube = type == SamplerType.TextureCube; - - // 2D Array and Cube shadow samplers with LOD level or bias requires an extension. - // If the extension is not supported, just remove the LOD parameter. - if (isArray && isShadow && (is2D || isCube) && !context.Config.GpuAccessor.QueryHostSupportsTextureShadowLod()) - { - hasLodBias = false; - hasLodLevel = false; - } - - // Cube shadow samplers with LOD level requires an extension. - // If the extension is not supported, just remove the LOD level parameter. - if (isShadow && isCube && !context.Config.GpuAccessor.QueryHostSupportsTextureShadowLod()) - { - hasLodLevel = false; - } - - // TODO: Bindless texture support. For now we just return 0. - if (isBindless) - { - string scalarValue = NumberFormatter.FormatFloat(0); - - if (colorIsVector) - { - AggregateType outputType = texOp.GetVectorType(AggregateType.FP32); - - if ((outputType & AggregateType.ElementCountMask) != 0) - { - return $"{Declarations.GetVarTypeName(context, outputType, precise: false)}({scalarValue})"; - } - } - - return scalarValue; - } - - string texCall = intCoords ? "texelFetch" : "texture"; - - if (isGather) - { - texCall += "Gather"; - } - else if (hasDerivatives) - { - texCall += "Grad"; - } - else if (hasLodLevel && !intCoords) - { - texCall += "Lod"; - } - - if (hasOffset) - { - texCall += "Offset"; - } - else if (hasOffsets) - { - texCall += "Offsets"; - } - - int srcIndex = isBindless ? 1 : 0; - - string Src(AggregateType type) - { - return GetSoureExpr(context, texOp.GetSource(srcIndex++), type); - } - - string indexExpr = null; - - if (isIndexed) - { - indexExpr = Src(AggregateType.S32); - } - - string samplerName = OperandManager.GetSamplerName(context.Config.Stage, texOp, indexExpr); - - texCall += "(" + samplerName; - - int coordsCount = texOp.Type.GetDimensions(); - - int pCount = coordsCount; - - int arrayIndexElem = -1; - - if (isArray) - { - arrayIndexElem = pCount++; - } - - // The sampler 1D shadow overload expects a - // dummy value on the middle of the vector, who knows why... - bool hasDummy1DShadowElem = texOp.Type == (SamplerType.Texture1D | SamplerType.Shadow); - - if (hasDummy1DShadowElem) - { - pCount++; - } - - if (isShadow && !isGather) - { - pCount++; - } - - // On textureGather*, the comparison value is - // always specified as an extra argument. - bool hasExtraCompareArg = isShadow && isGather; - - if (pCount == 5) - { - pCount = 4; - - hasExtraCompareArg = true; - } - - void Append(string str) - { - texCall += ", " + str; - } - - AggregateType coordType = intCoords ? AggregateType.S32 : AggregateType.FP32; - - string AssemblePVector(int count) - { - if (count > 1) - { - string[] elems = new string[count]; - - for (int index = 0; index < count; index++) - { - if (arrayIndexElem == index) - { - elems[index] = Src(AggregateType.S32); - - if (!intCoords) - { - elems[index] = "float(" + elems[index] + ")"; - } - } - else if (index == 1 && hasDummy1DShadowElem) - { - elems[index] = NumberFormatter.FormatFloat(0); - } - else - { - elems[index] = Src(coordType); - } - } - - string prefix = intCoords ? "i" : string.Empty; - - return prefix + "vec" + count + "(" + string.Join(", ", elems) + ")"; - } - else - { - return Src(coordType); - } - } - - string ApplyScaling(string vector) - { - if (intCoords) - { - if (context.Config.Stage.SupportsRenderScale() && - !isBindless && - !isIndexed) - { - int index = context.Config.FindTextureDescriptorIndex(texOp); - - if (pCount == 3 && isArray) - { - // The array index is not scaled, just x and y. - vector = "ivec3(Helper_TexelFetchScale((" + vector + ").xy, " + index + "), (" + vector + ").z)"; - } - else if (pCount == 2 && !isArray) - { - vector = "Helper_TexelFetchScale(" + vector + ", " + index + ")"; - } - } - } - - return vector; - } - - string ApplyBias(string vector) - { - int gatherBiasPrecision = context.Config.GpuAccessor.QueryHostGatherBiasPrecision(); - if (isGather && gatherBiasPrecision != 0) - { - // GPU requires texture gather to be slightly offset to match NVIDIA behaviour when point is exactly between two texels. - // Offset by the gather precision divided by 2 to correct for rounding. - - if (pCount == 1) - { - vector = $"{vector} + (1.0 / (float(textureSize({samplerName}, 0)) * float({1 << (gatherBiasPrecision + 1)})))"; - } - else - { - vector = $"{vector} + (1.0 / (vec{pCount}(textureSize({samplerName}, 0).{"xyz".Substring(0, pCount)}) * float({1 << (gatherBiasPrecision + 1)})))"; - } - } - - return vector; - } - - Append(ApplyBias(ApplyScaling(AssemblePVector(pCount)))); - - string AssembleDerivativesVector(int count) - { - if (count > 1) - { - string[] elems = new string[count]; - - for (int index = 0; index < count; index++) - { - elems[index] = Src(AggregateType.FP32); - } - - return "vec" + count + "(" + string.Join(", ", elems) + ")"; - } - else - { - return Src(AggregateType.FP32); - } - } - - if (hasExtraCompareArg) - { - Append(Src(AggregateType.FP32)); - } - - if (hasDerivatives) - { - Append(AssembleDerivativesVector(coordsCount)); // dPdx - Append(AssembleDerivativesVector(coordsCount)); // dPdy - } - - if (isMultisample) - { - Append(Src(AggregateType.S32)); - } - else if (hasLodLevel) - { - Append(Src(coordType)); - } - - string AssembleOffsetVector(int count) - { - if (count > 1) - { - string[] elems = new string[count]; - - for (int index = 0; index < count; index++) - { - elems[index] = Src(AggregateType.S32); - } - - return "ivec" + count + "(" + string.Join(", ", elems) + ")"; - } - else - { - return Src(AggregateType.S32); - } - } - - if (hasOffset) - { - Append(AssembleOffsetVector(coordsCount)); - } - else if (hasOffsets) - { - texCall += $", ivec{coordsCount}[4]("; - - texCall += AssembleOffsetVector(coordsCount) + ", "; - texCall += AssembleOffsetVector(coordsCount) + ", "; - texCall += AssembleOffsetVector(coordsCount) + ", "; - texCall += AssembleOffsetVector(coordsCount) + ")"; - } - - if (hasLodBias) - { - Append(Src(AggregateType.FP32)); - } - - // textureGather* optional extra component index, - // not needed for shadow samplers. - if (isGather && !isShadow) - { - Append(Src(AggregateType.S32)); - } - - texCall += ")" + (colorIsVector ? GetMaskMultiDest(texOp.Index) : ""); - - return texCall; - } - - public static string TextureSize(CodeGenContext context, AstOperation operation) - { - AstTextureOperation texOp = (AstTextureOperation)operation; - - bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0; - - // TODO: Bindless texture support. For now we just return 0. - if (isBindless) - { - return NumberFormatter.FormatInt(0); - } - - bool isIndexed = (texOp.Type & SamplerType.Indexed) != 0; - - string indexExpr = null; - - if (isIndexed) - { - indexExpr = GetSoureExpr(context, texOp.GetSource(0), AggregateType.S32); - } - - string samplerName = OperandManager.GetSamplerName(context.Config.Stage, texOp, indexExpr); - - if (texOp.Index == 3) - { - return $"textureQueryLevels({samplerName})"; - } - else - { - (TextureDescriptor descriptor, int descriptorIndex) = context.Config.FindTextureDescriptor(texOp); - bool hasLod = !descriptor.Type.HasFlag(SamplerType.Multisample) && descriptor.Type != SamplerType.TextureBuffer; - string texCall; - - if (hasLod) - { - int lodSrcIndex = isBindless || isIndexed ? 1 : 0; - IAstNode lod = operation.GetSource(lodSrcIndex); - string lodExpr = GetSoureExpr(context, lod, GetSrcVarType(operation.Inst, lodSrcIndex)); - - texCall = $"textureSize({samplerName}, {lodExpr}){GetMask(texOp.Index)}"; - } - else - { - texCall = $"textureSize({samplerName}){GetMask(texOp.Index)}"; - } - - if (context.Config.Stage.SupportsRenderScale() && - (texOp.Index < 2 || (texOp.Type & SamplerType.Mask) == SamplerType.Texture3D) && - !isBindless && - !isIndexed) - { - texCall = $"Helper_TextureSizeUnscale({texCall}, {descriptorIndex})"; - } - - return texCall; - } - } - - private static string GenerateLoadOrStore(CodeGenContext context, AstOperation operation, bool isStore) - { - StorageKind storageKind = operation.StorageKind; - - string varName; - AggregateType varType; - int srcIndex = 0; - - switch (storageKind) - { - case StorageKind.Input: - case StorageKind.InputPerPatch: - case StorageKind.Output: - case StorageKind.OutputPerPatch: - if (!(operation.GetSource(srcIndex++) is AstOperand varId) || varId.Type != OperandType.Constant) - { - throw new InvalidOperationException($"First input of {operation.Inst} with {storageKind} storage must be a constant operand."); - } - - IoVariable ioVariable = (IoVariable)varId.Value; - bool isOutput = storageKind.IsOutput(); - bool isPerPatch = storageKind.IsPerPatch(); - int location = -1; - int component = 0; - - if (context.Config.HasPerLocationInputOrOutput(ioVariable, isOutput)) - { - if (!(operation.GetSource(srcIndex++) is AstOperand vecIndex) || vecIndex.Type != OperandType.Constant) - { - throw new InvalidOperationException($"Second input of {operation.Inst} with {storageKind} storage must be a constant operand."); - } - - location = vecIndex.Value; - - if (operation.SourcesCount > srcIndex && - operation.GetSource(srcIndex) is AstOperand elemIndex && - elemIndex.Type == OperandType.Constant && - context.Config.HasPerLocationInputOrOutputComponent(ioVariable, location, elemIndex.Value, isOutput)) - { - component = elemIndex.Value; - srcIndex++; - } - } - - (varName, varType) = IoMap.GetGlslVariable(context.Config, ioVariable, location, component, isOutput, isPerPatch); - - if (IoMap.IsPerVertexBuiltIn(context.Config.Stage, ioVariable, isOutput)) - { - // Since those exist both as input and output on geometry and tessellation shaders, - // we need the gl_in and gl_out prefixes to disambiguate. - - if (storageKind == StorageKind.Input) - { - string expr = GetSoureExpr(context, operation.GetSource(srcIndex++), AggregateType.S32); - varName = $"gl_in[{expr}].{varName}"; - } - else if (storageKind == StorageKind.Output) - { - string expr = GetSoureExpr(context, operation.GetSource(srcIndex++), AggregateType.S32); - varName = $"gl_out[{expr}].{varName}"; - } - } - - int firstSrcIndex = srcIndex; - int inputsCount = isStore ? operation.SourcesCount - 1 : operation.SourcesCount; - - for (; srcIndex < inputsCount; srcIndex++) - { - IAstNode src = operation.GetSource(srcIndex); - - if ((varType & AggregateType.ElementCountMask) != 0 && - srcIndex == inputsCount - 1 && - src is AstOperand elementIndex && - elementIndex.Type == OperandType.Constant) - { - varName += "." + "xyzw"[elementIndex.Value & 3]; - } - else if (srcIndex == firstSrcIndex && context.Config.Stage == ShaderStage.TessellationControl && storageKind == StorageKind.Output) - { - // GLSL requires that for tessellation control shader outputs, - // that the index expression must be *exactly* "gl_InvocationID", - // otherwise the compilation fails. - // TODO: Get rid of this and use expression propagation to make sure we generate the correct code from IR. - varName += "[gl_InvocationID]"; - } - else - { - varName += $"[{GetSoureExpr(context, src, AggregateType.S32)}]"; - } - } - break; - - default: - throw new InvalidOperationException($"Invalid storage kind {storageKind}."); - } - - if (isStore) - { - varType &= AggregateType.ElementTypeMask; - varName = $"{varName} = {GetSoureExpr(context, operation.GetSource(srcIndex), varType)}"; - } - - return varName; - } - - private static string GetStorageBufferAccessor(string slotExpr, string offsetExpr, ShaderStage stage) - { - string sbName = OperandManager.GetShaderStagePrefix(stage); - - sbName += "_" + DefaultNames.StorageNamePrefix; - - return $"{sbName}[{slotExpr}].{DefaultNames.DataName}[{offsetExpr}]"; - } - - private static string GetMask(int index) - { - return $".{"rgba".AsSpan(index, 1)}"; - } - - private static string GetMaskMultiDest(int mask) - { - string swizzle = "."; - - for (int i = 0; i < 4; i++) - { - if ((mask & (1 << i)) != 0) - { - swizzle += "xyzw"[i]; - } - } - - return swizzle; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenPacking.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenPacking.cs deleted file mode 100644 index 5a888e9c..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenPacking.cs +++ /dev/null @@ -1,56 +0,0 @@ -using Ryujinx.Graphics.Shader.StructuredIr; -using System; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper; -using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGenPacking - { - public static string PackDouble2x32(CodeGenContext context, AstOperation operation) - { - IAstNode src0 = operation.GetSource(0); - IAstNode src1 = operation.GetSource(1); - - string src0Expr = GetSoureExpr(context, src0, GetSrcVarType(operation.Inst, 0)); - string src1Expr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 1)); - - return $"packDouble2x32(uvec2({src0Expr}, {src1Expr}))"; - } - - public static string PackHalf2x16(CodeGenContext context, AstOperation operation) - { - IAstNode src0 = operation.GetSource(0); - IAstNode src1 = operation.GetSource(1); - - string src0Expr = GetSoureExpr(context, src0, GetSrcVarType(operation.Inst, 0)); - string src1Expr = GetSoureExpr(context, src1, GetSrcVarType(operation.Inst, 1)); - - return $"packHalf2x16(vec2({src0Expr}, {src1Expr}))"; - } - - public static string UnpackDouble2x32(CodeGenContext context, AstOperation operation) - { - IAstNode src = operation.GetSource(0); - - string srcExpr = GetSoureExpr(context, src, GetSrcVarType(operation.Inst, 0)); - - return $"unpackDouble2x32({srcExpr}){GetMask(operation.Index)}"; - } - - public static string UnpackHalf2x16(CodeGenContext context, AstOperation operation) - { - IAstNode src = operation.GetSource(0); - - string srcExpr = GetSoureExpr(context, src, GetSrcVarType(operation.Inst, 0)); - - return $"unpackHalf2x16({srcExpr}){GetMask(operation.Index)}"; - } - - private static string GetMask(int index) - { - return $".{"xy".AsSpan(index, 1)}"; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenVector.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenVector.cs deleted file mode 100644 index f09ea2e8..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGenVector.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.StructuredIr; - -using static Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions.InstGenHelper; -using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class InstGenVector - { - public static string VectorExtract(CodeGenContext context, AstOperation operation) - { - IAstNode vector = operation.GetSource(0); - IAstNode index = operation.GetSource(1); - - string vectorExpr = GetSoureExpr(context, vector, OperandManager.GetNodeDestType(context, vector)); - - if (index is AstOperand indexOperand && indexOperand.Type == OperandType.Constant) - { - char elem = "xyzw"[indexOperand.Value]; - - return $"{vectorExpr}.{elem}"; - } - else - { - string indexExpr = GetSoureExpr(context, index, GetSrcVarType(operation.Inst, 1)); - - return $"{vectorExpr}[{indexExpr}]"; - } - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstInfo.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstInfo.cs deleted file mode 100644 index 7b2a6b46..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - readonly struct InstInfo - { - public InstType Type { get; } - - public string OpName { get; } - - public int Precedence { get; } - - public InstInfo(InstType type, string opName, int precedence) - { - Type = type; - OpName = opName; - Precedence = precedence; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstType.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstType.cs deleted file mode 100644 index 84e36cdd..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstType.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - [Flags] - enum InstType - { - OpNullary = Op | 0, - OpUnary = Op | 1, - OpBinary = Op | 2, - OpBinaryCom = Op | 2 | Commutative, - OpTernary = Op | 3, - - CallNullary = Call | 0, - CallUnary = Call | 1, - CallBinary = Call | 2, - CallTernary = Call | 3, - CallQuaternary = Call | 4, - - // The atomic instructions have one extra operand, - // for the storage slot and offset pair. - AtomicBinary = Call | Atomic | 3, - AtomicTernary = Call | Atomic | 4, - - Commutative = 1 << 8, - Op = 1 << 9, - Call = 1 << 10, - Atomic = 1 << 11, - Special = 1 << 12, - - ArityMask = 0xff - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/IoMap.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/IoMap.cs deleted file mode 100644 index 093ee232..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/IoMap.cs +++ /dev/null @@ -1,145 +0,0 @@ -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.Translation; -using System.Globalization; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions -{ - static class IoMap - { - public static (string, AggregateType) GetGlslVariable( - ShaderConfig config, - IoVariable ioVariable, - int location, - int component, - bool isOutput, - bool isPerPatch) - { - return ioVariable switch - { - IoVariable.BackColorDiffuse => ("gl_BackColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated. - IoVariable.BackColorSpecular => ("gl_BackSecondaryColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated. - IoVariable.BaseInstance => ("gl_BaseInstanceARB", AggregateType.S32), - IoVariable.BaseVertex => ("gl_BaseVertexARB", AggregateType.S32), - IoVariable.ClipDistance => ("gl_ClipDistance", AggregateType.Array | AggregateType.FP32), - IoVariable.CtaId => ("gl_WorkGroupID", AggregateType.Vector3 | AggregateType.U32), - IoVariable.DrawIndex => ("gl_DrawIDARB", AggregateType.S32), - IoVariable.FogCoord => ("gl_FogFragCoord", AggregateType.FP32), // Deprecated. - IoVariable.FragmentCoord => ("gl_FragCoord", AggregateType.Vector4 | AggregateType.FP32), - IoVariable.FragmentOutputColor => GetFragmentOutputColorVariableName(config, location), - IoVariable.FragmentOutputDepth => ("gl_FragDepth", AggregateType.FP32), - IoVariable.FragmentOutputIsBgra => (DefaultNames.SupportBlockIsBgraName, AggregateType.Array | AggregateType.Bool), - IoVariable.FrontColorDiffuse => ("gl_FrontColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated. - IoVariable.FrontColorSpecular => ("gl_FrontSecondaryColor", AggregateType.Vector4 | AggregateType.FP32), // Deprecated. - IoVariable.FrontFacing => ("gl_FrontFacing", AggregateType.Bool), - IoVariable.InstanceId => ("gl_InstanceID", AggregateType.S32), - IoVariable.InstanceIndex => ("gl_InstanceIndex", AggregateType.S32), - IoVariable.InvocationId => ("gl_InvocationID", AggregateType.S32), - IoVariable.Layer => ("gl_Layer", AggregateType.S32), - IoVariable.PatchVertices => ("gl_PatchVerticesIn", AggregateType.S32), - IoVariable.PointCoord => ("gl_PointCoord", AggregateType.Vector2 | AggregateType.FP32), - IoVariable.PointSize => ("gl_PointSize", AggregateType.FP32), - IoVariable.Position => ("gl_Position", AggregateType.Vector4 | AggregateType.FP32), - IoVariable.PrimitiveId => GetPrimitiveIdVariableName(config.Stage, isOutput), - IoVariable.SubgroupEqMask => GetSubgroupMaskVariableName(config, "Eq"), - IoVariable.SubgroupGeMask => GetSubgroupMaskVariableName(config, "Ge"), - IoVariable.SubgroupGtMask => GetSubgroupMaskVariableName(config, "Gt"), - IoVariable.SubgroupLaneId => GetSubgroupInvocationIdVariableName(config), - IoVariable.SubgroupLeMask => GetSubgroupMaskVariableName(config, "Le"), - IoVariable.SubgroupLtMask => GetSubgroupMaskVariableName(config, "Lt"), - IoVariable.SupportBlockRenderScale => (DefaultNames.SupportBlockRenderScaleName, AggregateType.Array | AggregateType.FP32), - IoVariable.SupportBlockViewInverse => (DefaultNames.SupportBlockViewportInverse, AggregateType.Vector2 | AggregateType.FP32), - IoVariable.TessellationCoord => ("gl_TessCoord", AggregateType.Vector3 | AggregateType.FP32), - IoVariable.TessellationLevelInner => ("gl_TessLevelInner", AggregateType.Array | AggregateType.FP32), - IoVariable.TessellationLevelOuter => ("gl_TessLevelOuter", AggregateType.Array | AggregateType.FP32), - IoVariable.TextureCoord => ("gl_TexCoord", AggregateType.Array | AggregateType.Vector4 | AggregateType.FP32), // Deprecated. - IoVariable.ThreadId => ("gl_LocalInvocationID", AggregateType.Vector3 | AggregateType.U32), - IoVariable.ThreadKill => ("gl_HelperInvocation", AggregateType.Bool), - IoVariable.UserDefined => GetUserDefinedVariableName(config, location, component, isOutput, isPerPatch), - IoVariable.VertexId => ("gl_VertexID", AggregateType.S32), - IoVariable.VertexIndex => ("gl_VertexIndex", AggregateType.S32), - IoVariable.ViewportIndex => ("gl_ViewportIndex", AggregateType.S32), - IoVariable.ViewportMask => ("gl_ViewportMask", AggregateType.Array | AggregateType.S32), - _ => (null, AggregateType.Invalid) - }; - } - - public static bool IsPerVertexBuiltIn(ShaderStage stage, IoVariable ioVariable, bool isOutput) - { - switch (ioVariable) - { - case IoVariable.Layer: - case IoVariable.ViewportIndex: - case IoVariable.PointSize: - case IoVariable.Position: - case IoVariable.ClipDistance: - case IoVariable.PointCoord: - case IoVariable.ViewportMask: - if (isOutput) - { - return stage == ShaderStage.TessellationControl; - } - else - { - return stage == ShaderStage.TessellationControl || - stage == ShaderStage.TessellationEvaluation || - stage == ShaderStage.Geometry; - } - } - - return false; - } - - private static (string, AggregateType) GetFragmentOutputColorVariableName(ShaderConfig config, int location) - { - if (location < 0) - { - return (DefaultNames.OAttributePrefix, config.GetFragmentOutputColorType(0)); - } - - string name = DefaultNames.OAttributePrefix + location.ToString(CultureInfo.InvariantCulture); - - return (name, config.GetFragmentOutputColorType(location)); - } - - private static (string, AggregateType) GetPrimitiveIdVariableName(ShaderStage stage, bool isOutput) - { - // The geometry stage has an additional gl_PrimitiveIDIn variable. - return (isOutput || stage != ShaderStage.Geometry ? "gl_PrimitiveID" : "gl_PrimitiveIDIn", AggregateType.S32); - } - - private static (string, AggregateType) GetSubgroupMaskVariableName(ShaderConfig config, string cc) - { - return config.GpuAccessor.QueryHostSupportsShaderBallot() - ? ($"unpackUint2x32(gl_SubGroup{cc}MaskARB)", AggregateType.Vector2 | AggregateType.U32) - : ($"gl_Subgroup{cc}Mask", AggregateType.Vector4 | AggregateType.U32); - } - - private static (string, AggregateType) GetSubgroupInvocationIdVariableName(ShaderConfig config) - { - return config.GpuAccessor.QueryHostSupportsShaderBallot() - ? ("gl_SubGroupInvocationARB", AggregateType.U32) - : ("gl_SubgroupInvocationID", AggregateType.U32); - } - - private static (string, AggregateType) GetUserDefinedVariableName(ShaderConfig config, int location, int component, bool isOutput, bool isPerPatch) - { - string name = isPerPatch - ? DefaultNames.PerPatchAttributePrefix - : (isOutput ? DefaultNames.OAttributePrefix : DefaultNames.IAttributePrefix); - - if (location < 0) - { - return (name, config.GetUserDefinedType(0, isOutput)); - } - - name += location.ToString(CultureInfo.InvariantCulture); - - if (config.HasPerLocationInputOrOutputComponent(IoVariable.UserDefined, location, component, isOutput)) - { - name += "_" + "xyzw"[component & 3]; - } - - return (name, config.GetUserDefinedType(location, isOutput)); - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/NumberFormatter.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/NumberFormatter.cs deleted file mode 100644 index eb27e9bf..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/NumberFormatter.cs +++ /dev/null @@ -1,104 +0,0 @@ -using Ryujinx.Graphics.Shader.Translation; -using System; -using System.Globalization; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - static class NumberFormatter - { - private const int MaxDecimal = 256; - - public static bool TryFormat(int value, AggregateType dstType, out string formatted) - { - if (dstType == AggregateType.FP32) - { - return TryFormatFloat(BitConverter.Int32BitsToSingle(value), out formatted); - } - else if (dstType == AggregateType.S32) - { - formatted = FormatInt(value); - } - else if (dstType == AggregateType.U32) - { - formatted = FormatUint((uint)value); - } - else if (dstType == AggregateType.Bool) - { - formatted = value != 0 ? "true" : "false"; - } - else - { - throw new ArgumentException($"Invalid variable type \"{dstType}\"."); - } - - return true; - } - - public static string FormatFloat(float value) - { - if (!TryFormatFloat(value, out string formatted)) - { - throw new ArgumentException("Failed to convert float value to string."); - } - - return formatted; - } - - public static bool TryFormatFloat(float value, out string formatted) - { - if (float.IsNaN(value) || float.IsInfinity(value)) - { - formatted = null; - - return false; - } - - formatted = value.ToString("G9", CultureInfo.InvariantCulture); - - if (!(formatted.Contains('.') || - formatted.Contains('e') || - formatted.Contains('E'))) - { - formatted += ".0"; - } - - return true; - } - - public static string FormatInt(int value, AggregateType dstType) - { - if (dstType == AggregateType.S32) - { - return FormatInt(value); - } - else if (dstType == AggregateType.U32) - { - return FormatUint((uint)value); - } - else - { - throw new ArgumentException($"Invalid variable type \"{dstType}\"."); - } - } - - public static string FormatInt(int value) - { - if (value <= MaxDecimal && value >= -MaxDecimal) - { - return value.ToString(CultureInfo.InvariantCulture); - } - - return "0x" + value.ToString("X", CultureInfo.InvariantCulture); - } - - public static string FormatUint(uint value) - { - if (value <= MaxDecimal && value >= 0) - { - return value.ToString(CultureInfo.InvariantCulture) + "u"; - } - - return "0x" + value.ToString("X", CultureInfo.InvariantCulture) + "u"; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs deleted file mode 100644 index 92e83358..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs +++ /dev/null @@ -1,254 +0,0 @@ -using Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions; -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; -using System; -using System.Collections.Generic; -using System.Diagnostics; - -using static Ryujinx.Graphics.Shader.StructuredIr.InstructionInfo; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - class OperandManager - { - private static readonly string[] _stagePrefixes = new string[] { "cp", "vp", "tcp", "tep", "gp", "fp" }; - - private Dictionary<AstOperand, string> _locals; - - public OperandManager() - { - _locals = new Dictionary<AstOperand, string>(); - } - - public string DeclareLocal(AstOperand operand) - { - string name = $"{DefaultNames.LocalNamePrefix}_{_locals.Count}"; - - _locals.Add(operand, name); - - return name; - } - - public string GetExpression(CodeGenContext context, AstOperand operand) - { - return operand.Type switch - { - OperandType.Argument => GetArgumentName(operand.Value), - OperandType.Constant => NumberFormatter.FormatInt(operand.Value), - OperandType.ConstantBuffer => GetConstantBufferName(operand, context.Config), - OperandType.LocalVariable => _locals[operand], - OperandType.Undefined => DefaultNames.UndefinedName, - _ => throw new ArgumentException($"Invalid operand type \"{operand.Type}\".") - }; - } - - private static string GetConstantBufferName(AstOperand operand, ShaderConfig config) - { - return GetConstantBufferName(operand.CbufSlot, operand.CbufOffset, config.Stage, config.UsedFeatures.HasFlag(FeatureFlags.CbIndexing)); - } - - public static string GetConstantBufferName(int slot, int offset, ShaderStage stage, bool cbIndexable) - { - return $"{GetUbName(stage, slot, cbIndexable)}[{offset >> 2}].{GetSwizzleMask(offset & 3)}"; - } - - private static string GetVec4Indexed(string vectorName, string indexExpr, bool indexElement) - { - if (indexElement) - { - return $"{vectorName}[{indexExpr}]"; - } - - string result = $"{vectorName}.x"; - for (int i = 1; i < 4; i++) - { - result = $"(({indexExpr}) == {i}) ? ({vectorName}.{GetSwizzleMask(i)}) : ({result})"; - } - return $"({result})"; - } - - public static string GetConstantBufferName(int slot, string offsetExpr, ShaderStage stage, bool cbIndexable, bool indexElement) - { - return GetVec4Indexed(GetUbName(stage, slot, cbIndexable) + $"[{offsetExpr} >> 2]", offsetExpr + " & 3", indexElement); - } - - public static string GetConstantBufferName(string slotExpr, string offsetExpr, ShaderStage stage, bool indexElement) - { - return GetVec4Indexed(GetUbName(stage, slotExpr) + $"[{offsetExpr} >> 2]", offsetExpr + " & 3", indexElement); - } - - public static string GetUbName(ShaderStage stage, int slot, bool cbIndexable) - { - if (cbIndexable) - { - return GetUbName(stage, NumberFormatter.FormatInt(slot, AggregateType.S32)); - } - - return $"{GetShaderStagePrefix(stage)}_{DefaultNames.UniformNamePrefix}{slot}_{DefaultNames.UniformNameSuffix}"; - } - - private static string GetUbName(ShaderStage stage, string slotExpr) - { - return $"{GetShaderStagePrefix(stage)}_{DefaultNames.UniformNamePrefix}[{slotExpr}].{DefaultNames.DataName}"; - } - - public static string GetSamplerName(ShaderStage stage, AstTextureOperation texOp, string indexExpr) - { - return GetSamplerName(stage, texOp.CbufSlot, texOp.Handle, texOp.Type.HasFlag(SamplerType.Indexed), indexExpr); - } - - public static string GetSamplerName(ShaderStage stage, int cbufSlot, int handle, bool indexed, string indexExpr) - { - string suffix = cbufSlot < 0 ? $"_tcb_{handle:X}" : $"_cb{cbufSlot}_{handle:X}"; - - if (indexed) - { - suffix += $"a[{indexExpr}]"; - } - - return GetShaderStagePrefix(stage) + "_" + DefaultNames.SamplerNamePrefix + suffix; - } - - public static string GetImageName(ShaderStage stage, AstTextureOperation texOp, string indexExpr) - { - return GetImageName(stage, texOp.CbufSlot, texOp.Handle, texOp.Format, texOp.Type.HasFlag(SamplerType.Indexed), indexExpr); - } - - public static string GetImageName( - ShaderStage stage, - int cbufSlot, - int handle, - TextureFormat format, - bool indexed, - string indexExpr) - { - string suffix = cbufSlot < 0 - ? $"_tcb_{handle:X}_{format.ToGlslFormat()}" - : $"_cb{cbufSlot}_{handle:X}_{format.ToGlslFormat()}"; - - if (indexed) - { - suffix += $"a[{indexExpr}]"; - } - - return GetShaderStagePrefix(stage) + "_" + DefaultNames.ImageNamePrefix + suffix; - } - - public static string GetShaderStagePrefix(ShaderStage stage) - { - int index = (int)stage; - - if ((uint)index >= _stagePrefixes.Length) - { - return "invalid"; - } - - return _stagePrefixes[index]; - } - - private static char GetSwizzleMask(int value) - { - return "xyzw"[value]; - } - - public static string GetArgumentName(int argIndex) - { - return $"{DefaultNames.ArgumentNamePrefix}{argIndex}"; - } - - public static AggregateType GetNodeDestType(CodeGenContext context, IAstNode node) - { - // TODO: Get rid of that function entirely and return the type from the operation generation - // functions directly, like SPIR-V does. - - if (node is AstOperation operation) - { - if (operation.Inst == Instruction.Load) - { - switch (operation.StorageKind) - { - case StorageKind.Input: - case StorageKind.InputPerPatch: - case StorageKind.Output: - case StorageKind.OutputPerPatch: - if (!(operation.GetSource(0) is AstOperand varId) || varId.Type != OperandType.Constant) - { - throw new InvalidOperationException($"First input of {operation.Inst} with {operation.StorageKind} storage must be a constant operand."); - } - - IoVariable ioVariable = (IoVariable)varId.Value; - bool isOutput = operation.StorageKind == StorageKind.Output || operation.StorageKind == StorageKind.OutputPerPatch; - bool isPerPatch = operation.StorageKind == StorageKind.InputPerPatch || operation.StorageKind == StorageKind.OutputPerPatch; - int location = 0; - int component = 0; - - if (context.Config.HasPerLocationInputOrOutput(ioVariable, isOutput)) - { - if (!(operation.GetSource(1) is AstOperand vecIndex) || vecIndex.Type != OperandType.Constant) - { - throw new InvalidOperationException($"Second input of {operation.Inst} with {operation.StorageKind} storage must be a constant operand."); - } - - location = vecIndex.Value; - - if (operation.SourcesCount > 2 && - operation.GetSource(2) is AstOperand elemIndex && - elemIndex.Type == OperandType.Constant && - context.Config.HasPerLocationInputOrOutputComponent(ioVariable, location, elemIndex.Value, isOutput)) - { - component = elemIndex.Value; - } - } - - (_, AggregateType varType) = IoMap.GetGlslVariable(context.Config, ioVariable, location, component, isOutput, isPerPatch); - - return varType & AggregateType.ElementTypeMask; - } - } - else if (operation.Inst == Instruction.Call) - { - AstOperand funcId = (AstOperand)operation.GetSource(0); - - Debug.Assert(funcId.Type == OperandType.Constant); - - return context.GetFunction(funcId.Value).ReturnType; - } - else if (operation.Inst == Instruction.VectorExtract) - { - return GetNodeDestType(context, operation.GetSource(0)) & ~AggregateType.ElementCountMask; - } - else if (operation is AstTextureOperation texOp) - { - if (texOp.Inst == Instruction.ImageLoad || - texOp.Inst == Instruction.ImageStore || - texOp.Inst == Instruction.ImageAtomic) - { - return texOp.GetVectorType(texOp.Format.GetComponentType()); - } - else if (texOp.Inst == Instruction.TextureSample) - { - return texOp.GetVectorType(GetDestVarType(operation.Inst)); - } - } - - return GetDestVarType(operation.Inst); - } - else if (node is AstOperand operand) - { - if (operand.Type == OperandType.Argument) - { - int argIndex = operand.Value; - - return context.CurrentFunction.GetArgumentType(argIndex); - } - - return OperandInfo.GetVarType(operand); - } - else - { - throw new ArgumentException($"Invalid node type \"{node?.GetType().Name ?? "null"}\"."); - } - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/TypeConversion.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/TypeConversion.cs deleted file mode 100644 index 22c8623c..00000000 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/TypeConversion.cs +++ /dev/null @@ -1,87 +0,0 @@ -using Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions; -using Ryujinx.Graphics.Shader.IntermediateRepresentation; -using Ryujinx.Graphics.Shader.StructuredIr; -using Ryujinx.Graphics.Shader.Translation; -using System; - -namespace Ryujinx.Graphics.Shader.CodeGen.Glsl -{ - static class TypeConversion - { - public static string ReinterpretCast( - CodeGenContext context, - IAstNode node, - AggregateType srcType, - AggregateType dstType) - { - if (node is AstOperand operand && operand.Type == OperandType.Constant) - { - if (NumberFormatter.TryFormat(operand.Value, dstType, out string formatted)) - { - return formatted; - } - } - - string expr = InstGen.GetExpression(context, node); - - return ReinterpretCast(expr, node, srcType, dstType); - } - - private static string ReinterpretCast(string expr, IAstNode node, AggregateType srcType, AggregateType dstType) - { - if (srcType == dstType) - { - return expr; - } - - if (srcType == AggregateType.FP32) - { - switch (dstType) - { - case AggregateType.Bool: return $"(floatBitsToInt({expr}) != 0)"; - case AggregateType.S32: return $"floatBitsToInt({expr})"; - case AggregateType.U32: return $"floatBitsToUint({expr})"; - } - } - else if (dstType == AggregateType.FP32) - { - switch (srcType) - { - case AggregateType.Bool: return $"intBitsToFloat({ReinterpretBoolToInt(expr, node, AggregateType.S32)})"; - case AggregateType.S32: return $"intBitsToFloat({expr})"; - case AggregateType.U32: return $"uintBitsToFloat({expr})"; - } - } - else if (srcType == AggregateType.Bool) - { - return ReinterpretBoolToInt(expr, node, dstType); - } - else if (dstType == AggregateType.Bool) - { - expr = InstGenHelper.Enclose(expr, node, Instruction.CompareNotEqual, isLhs: true); - - return $"({expr} != 0)"; - } - else if (dstType == AggregateType.S32) - { - return $"int({expr})"; - } - else if (dstType == AggregateType.U32) - { - return $"uint({expr})"; - } - - throw new ArgumentException($"Invalid reinterpret cast from \"{srcType}\" to \"{dstType}\"."); - } - - private static string ReinterpretBoolToInt(string expr, IAstNode node, AggregateType dstType) - { - string trueExpr = NumberFormatter.FormatInt(IrConsts.True, dstType); - string falseExpr = NumberFormatter.FormatInt(IrConsts.False, dstType); - - expr = InstGenHelper.Enclose(expr, node, Instruction.ConditionalSelect, isLhs: false); - - return $"({expr} ? {trueExpr} : {falseExpr})"; - } - } -}
\ No newline at end of file |