Remove output interpolation qualifier (#1070)

5 files changed, 14 insertions, 30 deletions

diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs
index a47c4611..fb58f84a 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs
@@ -400,9 +400,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
         {
             for (int attr = 0; attr < MaxAttributes; attr++)
             {
-                string iq = $"{DefineNames.OutQualifierPrefixName}{attr} ";
-
-                context.AppendLine($"layout (location = {attr}) {iq}out vec4 {DefaultNames.OAttributePrefix}{attr};");
+                context.AppendLine($"layout (location = {attr}) out vec4 {DefaultNames.OAttributePrefix}{attr};");
             }
 
             foreach (int attr in info.OAttributes.OrderBy(x => x).Where(x => x >= MaxAttributes))
diff --git a/Ryujinx.Graphics.Shader/DefineNames.cs b/Ryujinx.Graphics.Shader/DefineNames.cs
deleted file mode 100644
index b0430499..00000000
--- a/Ryujinx.Graphics.Shader/DefineNames.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Ryujinx.Graphics.Shader
-{
-    public static class DefineNames
-    {
-        public const string OutQualifierPrefixName = "S_OUT_QUALIFIER";
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/InterpolationQualifier.cs b/Ryujinx.Graphics.Shader/InterpolationQualifier.cs
index e710427d..b7a0c1c9 100644
--- a/Ryujinx.Graphics.Shader/InterpolationQualifier.cs
+++ b/Ryujinx.Graphics.Shader/InterpolationQualifier.cs
@@ -3,7 +3,7 @@ using System;
 namespace Ryujinx.Graphics.Shader
 {
     [Flags]
-    public enum InterpolationQualifier
+    enum InterpolationQualifier
     {
         None = 0,
 
@@ -17,18 +17,17 @@ namespace Ryujinx.Graphics.Shader
         FlagsMask = Centroid | Sample
     }
 
-    public static class InterpolationQualifierExtensions
+    static class InterpolationQualifierExtensions
     {
         public static string ToGlslQualifier(this InterpolationQualifier iq)
         {
-            string output = string.Empty;
-
-            switch (iq & ~InterpolationQualifier.FlagsMask)
+            string output = (iq & ~InterpolationQualifier.FlagsMask) switch
             {
-                case InterpolationQualifier.Flat:          output = "flat";          break;
-                case InterpolationQualifier.NoPerspective: output = "noperspective"; break;
-                case InterpolationQualifier.Smooth:        output = "smooth";        break;
-            }
+                InterpolationQualifier.Flat => "flat",
+                InterpolationQualifier.NoPerspective => "noperspective",
+                InterpolationQualifier.Smooth => "smooth",
+                _ => string.Empty
+            };
 
             if ((iq & InterpolationQualifier.Centroid) != 0)
             {
diff --git a/Ryujinx.Graphics.Shader/ShaderProgramInfo.cs b/Ryujinx.Graphics.Shader/ShaderProgramInfo.cs
index 1ff602a2..d91c9613 100644
--- a/Ryujinx.Graphics.Shader/ShaderProgramInfo.cs
+++ b/Ryujinx.Graphics.Shader/ShaderProgramInfo.cs
@@ -10,25 +10,20 @@ namespace Ryujinx.Graphics.Shader
         public ReadOnlyCollection<TextureDescriptor> Textures { get; }
         public ReadOnlyCollection<TextureDescriptor> Images   { get; }
 
-        public ReadOnlyCollection<InterpolationQualifier> InterpolationQualifiers { get; }
-
         public bool UsesInstanceId { get; }
 
         internal ShaderProgramInfo(
-            BufferDescriptor[]       cBuffers,
-            BufferDescriptor[]       sBuffers,
-            TextureDescriptor[]      textures,
-            TextureDescriptor[]      images,
-            InterpolationQualifier[] interpolationQualifiers,
-            bool                     usesInstanceId)
+            BufferDescriptor[]  cBuffers,
+            BufferDescriptor[]  sBuffers,
+            TextureDescriptor[] textures,
+            TextureDescriptor[] images,
+            bool                usesInstanceId)
         {
             CBuffers = Array.AsReadOnly(cBuffers);
             SBuffers = Array.AsReadOnly(sBuffers);
             Textures = Array.AsReadOnly(textures);
             Images   = Array.AsReadOnly(images);
 
-            InterpolationQualifiers = Array.AsReadOnly(interpolationQualifiers);
-
             UsesInstanceId = usesInstanceId;
         }
     }
diff --git a/Ryujinx.Graphics.Shader/Translation/Translator.cs b/Ryujinx.Graphics.Shader/Translation/Translator.cs
index a333db95..164e10a7 100644
--- a/Ryujinx.Graphics.Shader/Translation/Translator.cs
+++ b/Ryujinx.Graphics.Shader/Translation/Translator.cs
@@ -79,7 +79,6 @@ namespace Ryujinx.Graphics.Shader.Translation
                 program.SBufferDescriptors,
                 program.TextureDescriptors,
                 program.ImageDescriptors,
-                sInfo.InterpolationQualifiers,
                 sInfo.UsesInstanceId);
 
             string glslCode = program.Code;