Change non-unform shader extension to be more conservative (#99)

The previous fix for Tomodachi Life (#91) included the extension to all shaders, independently on if it was needed or not. This PR fixes that by lazily adding the extension only when it is actually needed.

This change should not be noticed by anyone, but it avoids having to modify shaders that do not perform any type of dynamic indexing, which apparently is something some modders care about.

Co-authored-by: AsperTheDog <guillerman0000@gmail.com>
Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/99

src/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs

@@ -82,6 +82,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
 
         public bool IsMainFunction { get; private set; }
         public bool MayHaveReturned { get; set; }
+        public bool WasNonUniformAccessDeclared { get; set; }
 
         public CodeGenContext(
             StructuredProgramInfo info,
@@ -89,6 +90,8 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
             GeneratorPool<Instruction> instPool,
             GeneratorPool<LiteralInteger> integerPool) : base(SpirvVersionPacked, instPool, integerPool)
         {
+            WasNonUniformAccessDeclared = false;
+
             Info = info;
             AttributeUsage = parameters.AttributeUsage;
             Definitions = parameters.Definitions;

src/Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs

@@ -591,7 +591,16 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
         {
             if (context.HostCapabilities.SupportsShaderNonUniformIndexing)
             {
+                if (!context.WasNonUniformAccessDeclared)
+                {
+                    context.AddExtension("SPV_EXT_descriptor_indexing");
+                    context.AddCapability(Capability.ShaderNonUniform);
+                    context.AddCapability(Capability.SampledImageArrayNonUniformIndexing);
+                    context.AddCapability(Capability.StorageImageArrayNonUniformIndexing);
+                }
+
                 context.Decorate(inst, Decoration.NonUniform);
+                context.WasNonUniformAccessDeclared = true;
             }
         }
 

src/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs

@@ -60,14 +60,6 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
                 context.AddCapability(Capability.Float64);
             }
 
-            if (parameters.HostCapabilities.SupportsShaderNonUniformIndexing)
-            {
-                context.AddExtension("SPV_EXT_descriptor_indexing");
-                context.AddCapability(Capability.ShaderNonUniform);
-                context.AddCapability(Capability.SampledImageArrayNonUniformIndexing);
-                context.AddCapability(Capability.StorageImageArrayNonUniformIndexing);
-            }
-
             if (parameters.Definitions.TransformFeedbackEnabled && parameters.Definitions.LastInVertexPipeline)
             {
                 context.AddCapability(Capability.TransformFeedback);