3 files changed, 32 insertions, 37 deletions

diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglPipeline.cs b/Ryujinx.Graphics/Gal/OpenGL/OglPipeline.cs
index 3c8ada3e..64768e28 100644
--- a/Ryujinx.Graphics/Gal/OpenGL/OglPipeline.cs
+++ b/Ryujinx.Graphics/Gal/OpenGL/OglPipeline.cs
@@ -1,4 +1,5 @@
 using OpenTK.Graphics.OpenGL;
+using Ryujinx.Graphics.Shader;
 using System;
 using System.Collections.Generic;
 
@@ -529,9 +530,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             {
                 if (stage != null)
                 {
-                    foreach (ShaderDeclInfo declInfo in stage.ConstBufferUsage)
+                    foreach (CBufferDescriptor desc in stage.ConstBufferUsage)
                     {
-                        long key = New.ConstBufferKeys[(int)stage.Type][declInfo.Cbuf];
+                        long key = New.ConstBufferKeys[(int)stage.Type][desc.Slot];
 
                         if (key != 0 && _buffer.TryGetUbo(key, out int uboHandle))
                         {
diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglShader.cs b/Ryujinx.Graphics/Gal/OpenGL/OglShader.cs
index 8faa9053..8f4072c5 100644
--- a/Ryujinx.Graphics/Gal/OpenGL/OglShader.cs
+++ b/Ryujinx.Graphics/Gal/OpenGL/OglShader.cs
@@ -1,5 +1,6 @@
 using OpenTK.Graphics.OpenGL;
-using Ryujinx.Graphics.Gal.Shader;
+using Ryujinx.Graphics.Shader;
+using Ryujinx.Graphics.Shader.Translation;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -51,54 +52,54 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             bool          isDualVp,
             GalShaderType type)
         {
-            GlslProgram program;
+            ShaderConfig config = new ShaderConfig(type, OglLimit.MaxUboSize);
 
-            GlslDecompiler decompiler = new GlslDecompiler(OglLimit.MaxUboSize, OglExtension.NvidiaDriver);
-
-            int shaderDumpIndex = ShaderDumper.DumpIndex;
+            ShaderProgram program;
 
             if (isDualVp)
             {
                 ShaderDumper.Dump(memory, position,  type, "a");
                 ShaderDumper.Dump(memory, positionB, type, "b");
 
-                program = decompiler.Decompile(memory, position, positionB, type);
+                program = Translator.Translate(memory, (ulong)position, (ulong)positionB, config);
             }
             else
             {
                 ShaderDumper.Dump(memory, position, type);
 
-                program = decompiler.Decompile(memory, position, type);
+                program = Translator.Translate(memory, (ulong)position, config);
             }
 
             string code = program.Code;
 
             if (ShaderDumper.IsDumpEnabled())
             {
+                int shaderDumpIndex = ShaderDumper.DumpIndex;
+
                 code = "//Shader " + shaderDumpIndex + Environment.NewLine + code;
             }
 
-            return new OglShaderStage(type, code, program.Uniforms, program.Textures);
+            return new OglShaderStage(type, code, program.Info.CBuffers, program.Info.Textures);
         }
 
-        public IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long key)
+        public IEnumerable<CBufferDescriptor> GetConstBufferUsage(long key)
         {
             if (_stages.TryGetValue(key, out OglShaderStage stage))
             {
                 return stage.ConstBufferUsage;
             }
 
-            return Enumerable.Empty<ShaderDeclInfo>();
+            return Enumerable.Empty<CBufferDescriptor>();
         }
 
-        public IEnumerable<ShaderDeclInfo> GetTextureUsage(long key)
+        public IEnumerable<TextureDescriptor> GetTextureUsage(long key)
         {
             if (_stages.TryGetValue(key, out OglShaderStage stage))
             {
                 return stage.TextureUsage;
             }
 
-            return Enumerable.Empty<ShaderDeclInfo>();
+            return Enumerable.Empty<TextureDescriptor>();
         }
 
         public unsafe void SetExtraData(float flipX, float flipY, int instance)
@@ -130,16 +131,6 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         private void Bind(OglShaderStage stage)
         {
-            if (stage.Type == GalShaderType.Geometry)
-            {
-                //Enhanced layouts are required for Geometry shaders
-                //skip this stage if current driver has no ARB_enhanced_layouts
-                if (!OglExtension.EnhancedLayouts)
-                {
-                    return;
-                }
-            }
-
             switch (stage.Type)
             {
                 case GalShaderType.Vertex:         Current.Vertex         = stage; break;
@@ -221,7 +212,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         private void BindUniformBlocks(int programHandle)
         {
-            int extraBlockindex = GL.GetUniformBlockIndex(programHandle, GlslDecl.ExtraUniformBlockName);
+            int extraBlockindex = GL.GetUniformBlockIndex(programHandle, "Extra");
 
             GL.UniformBlockBinding(programHandle, extraBlockindex, 0);
 
@@ -231,14 +222,16 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             {
                 if (stage != null)
                 {
-                    foreach (ShaderDeclInfo declInfo in stage.ConstBufferUsage)
+                    foreach (CBufferDescriptor desc in stage.ConstBufferUsage)
                     {
-                        int blockIndex = GL.GetUniformBlockIndex(programHandle, declInfo.Name);
+                        int blockIndex = GL.GetUniformBlockIndex(programHandle, desc.Name);
 
                         if (blockIndex < 0)
                         {
-                            //It is expected that its found, if it's not then driver might be in a malfunction
-                            throw new InvalidOperationException();
+                            //This may be fine, the compiler may optimize away unused uniform buffers,
+                            //and in this case the above call would return -1 as the buffer has been
+                            //optimized away.
+                            continue;
                         }
 
                         GL.UniformBlockBinding(programHandle, blockIndex, freeBinding);
@@ -263,9 +256,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             {
                 if (stage != null)
                 {
-                    foreach (ShaderDeclInfo decl in stage.TextureUsage)
+                    foreach (TextureDescriptor desc in stage.TextureUsage)
                     {
-                        int location = GL.GetUniformLocation(programHandle, decl.Name);
+                        int location = GL.GetUniformLocation(programHandle, desc.Name);
 
                         GL.Uniform1(location, index);
 
diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglShaderProgram.cs b/Ryujinx.Graphics/Gal/OpenGL/OglShaderProgram.cs
index 9e68a8e6..86126bca 100644
--- a/Ryujinx.Graphics/Gal/OpenGL/OglShaderProgram.cs
+++ b/Ryujinx.Graphics/Gal/OpenGL/OglShaderProgram.cs
@@ -1,4 +1,5 @@
 using OpenTK.Graphics.OpenGL;
+using Ryujinx.Graphics.Shader;
 using System;
 using System.Collections.Generic;
 
@@ -23,14 +24,14 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         public string Code { get; private set; }
 
-        public IEnumerable<ShaderDeclInfo> ConstBufferUsage { get; private set; }
-        public IEnumerable<ShaderDeclInfo> TextureUsage     { get; private set; }
+        public IEnumerable<CBufferDescriptor> ConstBufferUsage { get; private set; }
+        public IEnumerable<TextureDescriptor> TextureUsage     { get; private set; }
 
         public OglShaderStage(
-            GalShaderType               type,
-            string                      code,
-            IEnumerable<ShaderDeclInfo> constBufferUsage,
-            IEnumerable<ShaderDeclInfo> textureUsage)
+            GalShaderType                  type,
+            string                         code,
+            IEnumerable<CBufferDescriptor> constBufferUsage,
+            IEnumerable<TextureDescriptor> textureUsage)
         {
             Type             = type;
             Code             = code;