Organized the Gpu folder a bit more, renamed a few things, address PR feedback

Ryujinx.Graphics/Gal/GalConsts.cs

@@ -1,7 +0,0 @@
-namespace Ryujinx.Graphics.Gal
-{
-    public static class GalConsts
-    {
-        public const string FlipUniformName = "flip";
-    }
-}

Ryujinx.Graphics/Gal/IGalFrameBuffer.cs

@@ -4,13 +4,13 @@ namespace Ryujinx.Graphics.Gal
 {
     public interface IGalFrameBuffer
     {
-        void Create(long Tag, int Width, int Height);
+        void Create(long Key, int Width, int Height);
 
-        void Bind(long Tag);
+        void Bind(long Key);
 
-        void BindTexture(long Tag, int Index);
+        void BindTexture(long Key, int Index);
 
-        void Set(long Tag);
+        void Set(long Key);
 
         void Set(byte[] Data, int Width, int Height);
 
@@ -22,6 +22,6 @@ namespace Ryujinx.Graphics.Gal
 
         void Render();
 
-        void GetBufferData(long Tag, Action<byte[]> Callback);
+        void GetBufferData(long Key, Action<byte[]> Callback);
     }
 }

Ryujinx.Graphics/Gal/IGalRasterizer.cs

@@ -4,20 +4,20 @@ namespace Ryujinx.Graphics.Gal
     {
         void ClearBuffers(int RtIndex, GalClearBufferFlags Flags);
 
-        bool IsVboCached(long Tag, long DataSize);
+        bool IsVboCached(long Key, long DataSize);
 
-        bool IsIboCached(long Tag, long DataSize);
+        bool IsIboCached(long Key, long DataSize);
 
-        void CreateVbo(long Tag, byte[] Buffer);
+        void CreateVbo(long Key, byte[] Buffer);
 
-        void CreateIbo(long Tag, byte[] Buffer);
+        void CreateIbo(long Key, byte[] Buffer);
 
-        void SetVertexArray(int VbIndex, int Stride, long VboTag, GalVertexAttrib[] Attribs);
+        void SetVertexArray(int VbIndex, int Stride, long VboKey, GalVertexAttrib[] Attribs);
 
-        void SetIndexArray(long Tag, int Size, GalIndexFormat Format);
+        void SetIndexArray(long Key, int Size, GalIndexFormat Format);
 
         void DrawArrays(int First, int PrimCount, GalPrimitiveType PrimType);
 
-        void DrawElements(long IboTag, int First, GalPrimitiveType PrimType);
+        void DrawElements(long IboKey, int First, GalPrimitiveType PrimType);
     }
 }

Ryujinx.Graphics/Gal/IGalShader.cs

@@ -4,17 +4,17 @@ namespace Ryujinx.Graphics.Gal
 {
     public interface IGalShader
     {
-        void Create(IGalMemory Memory, long Tag, GalShaderType Type);
+        void Create(IGalMemory Memory, long Key, GalShaderType Type);
 
-        IEnumerable<ShaderDeclInfo> GetTextureUsage(long Tag);
+        IEnumerable<ShaderDeclInfo> GetTextureUsage(long Key);
 
-        void SetConstBuffer(long Tag, int Cbuf, byte[] Data);
+        void SetConstBuffer(long Key, int Cbuf, byte[] Data);
 
-        void SetUniform1(string UniformName, int Value);
+        void EnsureTextureBinding(string UniformName, int Value);
 
-        void SetUniform2F(string UniformName, float X, float Y);
+        void SetFlip(float X, float Y);
 
-        void Bind(long Tag);
+        void Bind(long Key);
 
         void BindProgram();
     }

Ryujinx.Graphics/Gal/IGalTexture.cs

@@ -2,11 +2,11 @@ namespace Ryujinx.Graphics.Gal
 {
     public interface IGalTexture
     {
-        void Create(long Tag, byte[] Data, GalTexture Texture);
+        void Create(long Key, byte[] Data, GalTexture Texture);
 
-        bool TryGetCachedTexture(long Tag, long DataSize, out GalTexture Texture);
+        bool TryGetCachedTexture(long Key, long DataSize, out GalTexture Texture);
 
-        void Bind(long Tag, int Index);
+        void Bind(long Key, int Index);
 
         void SetSampler(GalTextureSampler Sampler);
     }

Ryujinx.Graphics/Gal/OpenGL/OGLFrameBuffer.cs

@@ -76,14 +76,14 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             Shader = new ShaderProgram();
         }
 
-        public void Create(long Tag, int Width, int Height)
+        public void Create(long Key, int Width, int Height)
         {
             //TODO: We should either use the original frame buffer size,
             //or just remove the Width/Height arguments.
             Width  = Window.Width;
             Height = Window.Height;
 
-            if (Fbs.TryGetValue(Tag, out FrameBuffer Fb))
+            if (Fbs.TryGetValue(Key, out FrameBuffer Fb))
             {
                 if (Fb.Width  != Width ||
                     Fb.Height != Height)
@@ -127,12 +127,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
             GL.Viewport(0, 0, Width, Height);
 
-            Fbs.Add(Tag, Fb);
+            Fbs.Add(Key, Fb);
         }
 
-        public void Bind(long Tag)
+        public void Bind(long Key)
         {
-            if (Fbs.TryGetValue(Tag, out FrameBuffer Fb))
+            if (Fbs.TryGetValue(Key, out FrameBuffer Fb))
             {
                 GL.BindFramebuffer(FramebufferTarget.Framebuffer, Fb.Handle);
 
@@ -140,9 +140,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             }
         }
 
-        public void BindTexture(long Tag, int Index)
+        public void BindTexture(long Key, int Index)
         {
-            if (Fbs.TryGetValue(Tag, out FrameBuffer Fb))
+            if (Fbs.TryGetValue(Key, out FrameBuffer Fb))
             {
                 GL.ActiveTexture(TextureUnit.Texture0 + Index);
 
@@ -150,9 +150,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             }
         }
 
-        public void Set(long Tag)
+        public void Set(long Key)
         {
-            if (Fbs.TryGetValue(Tag, out FrameBuffer Fb))
+            if (Fbs.TryGetValue(Key, out FrameBuffer Fb))
             {
                 CurrTexHandle = Fb.TexHandle;
             }
@@ -277,9 +277,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             }
         }
 
-        public void GetBufferData(long Tag, Action<byte[]> Callback)
+        public void GetBufferData(long Key, Action<byte[]> Callback)
         {
-            if (Fbs.TryGetValue(Tag, out FrameBuffer Fb))
+            if (Fbs.TryGetValue(Key, out FrameBuffer Fb))
             {
                 GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, Fb.Handle);
 

Ryujinx.Graphics/Gal/OpenGL/OGLRasterizer.cs

@@ -74,8 +74,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
         {
             ClearBufferMask Mask = 0;
 
-            //OpenGL doesn't support clearing just a single color channel,
+            //TODO: Use glColorMask to clear just the specified channels.
-            //so we can't just clear all channels...
             if (Flags.HasFlag(GalClearBufferFlags.ColorRed)   &&
                 Flags.HasFlag(GalClearBufferFlags.ColorGreen) &&
                 Flags.HasFlag(GalClearBufferFlags.ColorBlue)  &&
@@ -97,45 +96,43 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             GL.Clear(Mask);
         }
 
-        public bool IsVboCached(long Tag, long DataSize)
+        public bool IsVboCached(long Key, long DataSize)
         {
-            return VboCache.TryGetSize(Tag, out long Size) && Size == DataSize;
+            return VboCache.TryGetSize(Key, out long Size) && Size == DataSize;
         }
 
-        public bool IsIboCached(long Tag, long DataSize)
+        public bool IsIboCached(long Key, long DataSize)
         {
-            return IboCache.TryGetSize(Tag, out long Size) && Size == DataSize;
+            return IboCache.TryGetSize(Key, out long Size) && Size == DataSize;
         }
 
-        public void CreateVbo(long Tag, byte[] Buffer)
+        public void CreateVbo(long Key, byte[] Buffer)
         {
             int Handle = GL.GenBuffer();
 
-            VboCache.AddOrUpdate(Tag, Handle, (uint)Buffer.Length);
+            VboCache.AddOrUpdate(Key, Handle, (uint)Buffer.Length);
 
             IntPtr Length = new IntPtr(Buffer.Length);
 
             GL.BindBuffer(BufferTarget.ArrayBuffer, Handle);
             GL.BufferData(BufferTarget.ArrayBuffer, Length, Buffer, BufferUsageHint.StreamDraw);
-            GL.BindBuffer(BufferTarget.ArrayBuffer, 0);
         }
 
-        public void CreateIbo(long Tag, byte[] Buffer)
+        public void CreateIbo(long Key, byte[] Buffer)
         {
             int Handle = GL.GenBuffer();
 
-            IboCache.AddOrUpdate(Tag, Handle, (uint)Buffer.Length);
+            IboCache.AddOrUpdate(Key, Handle, (uint)Buffer.Length);
 
             IntPtr Length = new IntPtr(Buffer.Length);
 
             GL.BindBuffer(BufferTarget.ElementArrayBuffer, Handle);
             GL.BufferData(BufferTarget.ElementArrayBuffer, Length, Buffer, BufferUsageHint.StreamDraw);
-            GL.BindBuffer(BufferTarget.ElementArrayBuffer, 0);
         }
 
-        public void SetVertexArray(int VbIndex, int Stride, long VboTag, GalVertexAttrib[] Attribs)
+        public void SetVertexArray(int VbIndex, int Stride, long VboKey, GalVertexAttrib[] Attribs)
         {
-            if (!VboCache.TryGetValue(VboTag, out int VboHandle))
+            if (!VboCache.TryGetValue(VboKey, out int VboHandle))
             {
                 return;
             }
@@ -178,11 +175,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
                 GL.VertexAttribPointer(Attrib.Index, Size, Type, Normalize, Stride, Offset);
             }
-
-            GL.BindVertexArray(0);
         }
 
-        public void SetIndexArray(long Tag, int Size, GalIndexFormat Format)
+        public void SetIndexArray(long Key, int Size, GalIndexFormat Format)
         {
             IndexBuffer.Type = OGLEnumConverter.GetDrawElementsType(Format);
 
@@ -201,9 +196,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             GL.DrawArrays(OGLEnumConverter.GetPrimitiveType(PrimType), First, PrimCount);
         }
 
-        public void DrawElements(long IboTag, int First, GalPrimitiveType PrimType)
+        public void DrawElements(long IboKey, int First, GalPrimitiveType PrimType)
         {
-            if (!IboCache.TryGetValue(IboTag, out int IboHandle))
+            if (!IboCache.TryGetValue(IboKey, out int IboHandle))
             {
                 return;
             }

Ryujinx.Graphics/Gal/OpenGL/OGLRenderer.cs

@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 
 namespace Ryujinx.Graphics.Gal.OpenGL
 {
-    public class OpenGLRenderer : IGalRenderer
+    public class OGLRenderer : IGalRenderer
     {
         public IGalBlend Blend { get; private set; }
 
@@ -17,7 +17,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
 
         private ConcurrentQueue<Action> ActionsQueue;
 
-        public OpenGLRenderer()
+        public OGLRenderer()
         {
             Blend = new OGLBlend();
 

Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs

@@ -84,9 +84,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             Programs = new Dictionary<ShaderProgram, int>();
         }
 
-        public void Create(IGalMemory Memory, long Tag, GalShaderType Type)
+        public void Create(IGalMemory Memory, long Key, GalShaderType Type)
         {
-            Stages.GetOrAdd(Tag, (Key) => ShaderStageFactory(Memory, Tag, Type));
+            Stages.GetOrAdd(Key, (Stage) => ShaderStageFactory(Memory, Key, Type));
         }
 
         private ShaderStage ShaderStageFactory(IGalMemory Memory, long Position, GalShaderType Type)
@@ -107,9 +107,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             return Decompiler.Decompile(Memory, Position + 0x50, Type);
         }
 
-        public IEnumerable<ShaderDeclInfo> GetTextureUsage(long Tag)
+        public IEnumerable<ShaderDeclInfo> GetTextureUsage(long Key)
         {
-            if (Stages.TryGetValue(Tag, out ShaderStage Stage))
+            if (Stages.TryGetValue(Key, out ShaderStage Stage))
             {
                 return Stage.TextureUsage;
             }
@@ -117,11 +117,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             return Enumerable.Empty<ShaderDeclInfo>();
         }
 
-        public void SetConstBuffer(long Tag, int Cbuf, byte[] Data)
+        public void SetConstBuffer(long Key, int Cbuf, byte[] Data)
         {
             BindProgram();
 
-            if (Stages.TryGetValue(Tag, out ShaderStage Stage))
+            if (Stages.TryGetValue(Key, out ShaderStage Stage))
             {
                 foreach (ShaderDeclInfo DeclInfo in Stage.UniformUsage.Where(x => x.Cbuf == Cbuf))
                 {
@@ -144,7 +144,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             }
         }
 
-        public void SetUniform1(string UniformName, int Value)
+        public void EnsureTextureBinding(string UniformName, int Value)
         {
             BindProgram();
 
@@ -153,18 +153,18 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             GL.Uniform1(Location, Value);
         }
 
-        public void SetUniform2F(string UniformName, float X, float Y)
+        public void SetFlip(float X, float Y)
         {
             BindProgram();
 
-            int Location = GL.GetUniformLocation(CurrentProgramHandle, UniformName);
+            int Location = GL.GetUniformLocation(CurrentProgramHandle, GlslDecl.FlipUniformName);
 
             GL.Uniform2(Location, X, Y);
         }
 
-        public void Bind(long Tag)
+        public void Bind(long Key)
         {
-            if (Stages.TryGetValue(Tag, out ShaderStage Stage))
+            if (Stages.TryGetValue(Key, out ShaderStage Stage))
             {
                 Bind(Stage);
             }

Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs

@@ -31,11 +31,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             GL.DeleteTexture(CachedTexture.Handle);
         }
 
-        public void Create(long Tag, byte[] Data, GalTexture Texture)
+        public void Create(long Key, byte[] Data, GalTexture Texture)
         {
             int Handle = GL.GenTexture();
 
-            TextureCache.AddOrUpdate(Tag, new TCE(Handle, Texture), (uint)Data.Length);
+            TextureCache.AddOrUpdate(Key, new TCE(Handle, Texture), (uint)Data.Length);
 
             GL.BindTexture(TextureTarget.Texture2D, Handle);
 
@@ -146,11 +146,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             throw new ArgumentException(nameof(Format));
         }
 
-        public bool TryGetCachedTexture(long Tag, long DataSize, out GalTexture Texture)
+        public bool TryGetCachedTexture(long Key, long DataSize, out GalTexture Texture)
         {
-            if (TextureCache.TryGetSize(Tag, out long Size) && Size == DataSize)
+            if (TextureCache.TryGetSize(Key, out long Size) && Size == DataSize)
             {
-                if (TextureCache.TryGetValue(Tag, out TCE CachedTexture))
+                if (TextureCache.TryGetValue(Key, out TCE CachedTexture))
                 {
                     Texture = CachedTexture.Texture;
 
@@ -163,9 +163,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
             return false;
         }
 
-        public void Bind(long Tag, int Index)
+        public void Bind(long Key, int Index)
         {
-            if (TextureCache.TryGetValue(Tag, out TCE CachedTexture))
+            if (TextureCache.TryGetValue(Key, out TCE CachedTexture))
             {
                 GL.ActiveTexture(TextureUnit.Texture0 + Index);
 

Ryujinx.Graphics/Gal/Shader/GlslDecl.cs

@@ -26,6 +26,8 @@ namespace Ryujinx.Graphics.Gal.Shader
 
         public const string FragmentOutputName = "FragColor";
 
+        public const string FlipUniformName = "flip";
+
         private string[] StagePrefixes = new string[] { "vp", "tcp", "tep", "gp", "fp" };
 
         private string StagePrefix;

Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs

@@ -140,7 +140,7 @@ namespace Ryujinx.Graphics.Gal.Shader
         {
             if (Decl.ShaderType == GalShaderType.Vertex)
             {
-                SB.AppendLine("uniform vec2 " + GalConsts.FlipUniformName + ";");
+                SB.AppendLine("uniform vec2 " + GlslDecl.FlipUniformName + ";");
             }
 
             foreach (ShaderDeclInfo DeclInfo in Decl.Uniforms.Values.OrderBy(DeclKeySelector))

Ryujinx.HLE/Gpu/Engines/INvGpuEngine.cs

@@ -1,4 +1,6 @@
-namespace Ryujinx.HLE.Gpu
+using Ryujinx.HLE.Gpu.Memory;
+
+namespace Ryujinx.HLE.Gpu.Engines
 {
     interface INvGpuEngine
     {

Ryujinx.HLE/Gpu/Engines/MacroInterpreter.cs

@@ -1,7 +1,9 @@
+using Ryujinx.HLE.Gpu.Exceptions;
+using Ryujinx.HLE.Gpu.Memory;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     class MacroInterpreter
     {
@@ -419,7 +421,7 @@ namespace Ryujinx.HLE.Gpu
             //draw calls, this prevents the system from freezing (and throws instead).
             if (MethAddr == 0x585 && ++CallCount > MaxCallCountPerRun)
             {
-                throw new GpuMacroException(GpuMacroExceptionMsgs.CallCountExceeded);
+                GpuExceptionHelper.ThrowCallCoundExceeded();
             }
 
             NvGpuPBEntry PBEntry = new NvGpuPBEntry(MethAddr, 0, Value);

Ryujinx.HLE/Gpu/Engines/NvGpuEngine.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     enum NvGpuEngine
     {

Ryujinx.HLE/Gpu/Engines/NvGpuEngine2d.cs

@@ -1,7 +1,9 @@
 using Ryujinx.Graphics.Gal;
+using Ryujinx.HLE.Gpu.Memory;
+using Ryujinx.HLE.Gpu.Texture;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     class NvGpuEngine2d : INvGpuEngine
     {
@@ -75,19 +77,19 @@ namespace Ryujinx.HLE.Gpu
 
             int DstBlockHeight = 1 << ((DstBlkDim >> 4) & 0xf);
 
-            long Tag = Vmm.GetPhysicalAddress(MakeInt64From2xInt32(NvGpuEngine2dReg.SrcAddress));
+            long Key = Vmm.GetPhysicalAddress(MakeInt64From2xInt32(NvGpuEngine2dReg.SrcAddress));
 
             long SrcAddress = MakeInt64From2xInt32(NvGpuEngine2dReg.SrcAddress);
             long DstAddress = MakeInt64From2xInt32(NvGpuEngine2dReg.DstAddress);
 
-            bool IsFbTexture = Gpu.Engine3d.IsFrameBufferPosition(Tag);
+            bool IsFbTexture = Gpu.Engine3d.IsFrameBufferPosition(Key);
 
             if (IsFbTexture && DstLinear)
             {
                 DstSwizzle = TextureSwizzle.BlockLinear;
             }
 
-            Texture DstTexture = new Texture(
+            TextureInfo DstTexture = new TextureInfo(
                 DstAddress,
                 DstWidth,
                 DstHeight,
@@ -103,7 +105,7 @@ namespace Ryujinx.HLE.Gpu
                 SrcWidth  = 1280;
                 SrcHeight = 720;
 
-                Gpu.Renderer.FrameBuffer.GetBufferData(Tag, (byte[] Buffer) =>
+                Gpu.Renderer.FrameBuffer.GetBufferData(Key, (byte[] Buffer) =>
                 {
                     CopyTexture(
                         Vmm,
@@ -130,7 +132,7 @@ namespace Ryujinx.HLE.Gpu
 
         private void CopyTexture(
             NvGpuVmm Vmm,
-            Texture  Texture,
+            TextureInfo  Texture,
             byte[]   Buffer,
             int      Width,
             int      Height)

Ryujinx.HLE/Gpu/Engines/NvGpuEngine2dReg.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     enum NvGpuEngine2dReg
     {

Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs

@@ -1,8 +1,10 @@
 using Ryujinx.Graphics.Gal;
+using Ryujinx.HLE.Gpu.Memory;
+using Ryujinx.HLE.Gpu.Texture;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     class NvGpuEngine3d : INvGpuEngine
     {
@@ -73,13 +75,13 @@ namespace Ryujinx.HLE.Gpu
         {
             SetFrameBuffer(Vmm, 0);
 
-            long[] Tags = UploadShaders(Vmm);
+            long[] Keys = UploadShaders(Vmm);
 
             Gpu.Renderer.Shader.BindProgram();
 
             SetAlphaBlending();
 
-            UploadTextures(Vmm, Tags);
+            UploadTextures(Vmm, Keys);
             UploadUniforms(Vmm);
             UploadVertexArrays(Vmm);
         }
@@ -119,7 +121,7 @@ namespace Ryujinx.HLE.Gpu
 
         private long[] UploadShaders(NvGpuVmm Vmm)
         {
-            long[] Tags = new long[5];
+            long[] Keys = new long[5];
 
             long BasePosition = MakeInt64From2xInt32(NvGpuEngine3dReg.ShaderAddress);
 
@@ -136,14 +138,14 @@ namespace Ryujinx.HLE.Gpu
                     continue;
                 }
 
-                long Tag = BasePosition + (uint)Offset;
+                long Key = BasePosition + (uint)Offset;
 
                 GalShaderType ShaderType = GetTypeFromProgram(Index);
 
-                Tags[(int)ShaderType] = Tag;
+                Keys[(int)ShaderType] = Key;
 
-                Gpu.Renderer.Shader.Create(Vmm, Tag, ShaderType);
+                Gpu.Renderer.Shader.Create(Vmm, Key, ShaderType);
-                Gpu.Renderer.Shader.Bind(Tag);
+                Gpu.Renderer.Shader.Bind(Key);
             }
 
             int RawSX = ReadRegister(NvGpuEngine3dReg.ViewportScaleX);
@@ -155,9 +157,9 @@ namespace Ryujinx.HLE.Gpu
             float SignX = MathF.Sign(SX);
             float SignY = MathF.Sign(SY);
 
-            Gpu.Renderer.Shader.SetUniform2F(GalConsts.FlipUniformName, SignX, SignY);
+            Gpu.Renderer.Shader.SetFlip(SignX, SignY);
 
-            return Tags;
+            return Keys;
         }
 
         private static GalShaderType GetTypeFromProgram(int Program)
@@ -224,7 +226,7 @@ namespace Ryujinx.HLE.Gpu
             }
         }
 
-        private void UploadTextures(NvGpuVmm Vmm, long[] Tags)
+        private void UploadTextures(NvGpuVmm Vmm, long[] Keys)
         {
             long BaseShPosition = MakeInt64From2xInt32(NvGpuEngine3dReg.ShaderAddress);
 
@@ -234,15 +236,15 @@ namespace Ryujinx.HLE.Gpu
             //reserved for drawing the frame buffer.
             int TexIndex = 1;
 
-            for (int Index = 0; Index < Tags.Length; Index++)
+            for (int Index = 0; Index < Keys.Length; Index++)
             {
-                foreach (ShaderDeclInfo DeclInfo in Gpu.Renderer.Shader.GetTextureUsage(Tags[Index]))
+                foreach (ShaderDeclInfo DeclInfo in Gpu.Renderer.Shader.GetTextureUsage(Keys[Index]))
                 {
                     long Position = ConstBuffers[Index][TextureCbIndex].Position;
 
                     UploadTexture(Vmm, Position, TexIndex, DeclInfo.Index);
 
-                    Gpu.Renderer.Shader.SetUniform1(DeclInfo.Name, TexIndex);
+                    Gpu.Renderer.Shader.EnsureTextureBinding(DeclInfo.Name, TexIndex);
 
                     TexIndex++;
                 }
@@ -277,7 +279,7 @@ namespace Ryujinx.HLE.Gpu
 
             long TextureAddress = Vmm.ReadInt64(TicPosition + 4) & 0xffffffffffff;
 
-            long Tag = TextureAddress;
+            long Key = TextureAddress;
 
             TextureAddress = Vmm.GetPhysicalAddress(TextureAddress);
 
@@ -297,11 +299,11 @@ namespace Ryujinx.HLE.Gpu
 
                 bool HasCachedTexture = false;
 
-                if (Gpu.Renderer.Texture.TryGetCachedTexture(Tag, Size, out GalTexture Texture))
+                if (Gpu.Renderer.Texture.TryGetCachedTexture(Key, Size, out GalTexture Texture))
                 {
-                    if (NewTexture.Equals(Texture) && !Vmm.IsRegionModified(Tag, Size, NvGpuBufferType.Texture))
+                    if (NewTexture.Equals(Texture) && !Vmm.IsRegionModified(Key, Size, NvGpuBufferType.Texture))
                     {
-                        Gpu.Renderer.Texture.Bind(Tag, TexIndex);
+                        Gpu.Renderer.Texture.Bind(Key, TexIndex);
 
                         HasCachedTexture = true;
                     }
@@ -311,10 +313,10 @@ namespace Ryujinx.HLE.Gpu
                 {
                     byte[] Data = TextureFactory.GetTextureData(Vmm, TicPosition);
 
-                    Gpu.Renderer.Texture.Create(Tag, Data, NewTexture);
+                    Gpu.Renderer.Texture.Create(Key, Data, NewTexture);
                 }
 
-                Gpu.Renderer.Texture.Bind(Tag, TexIndex);
+                Gpu.Renderer.Texture.Bind(Key, TexIndex);
             }
 
             Gpu.Renderer.Texture.SetSampler(Sampler);

Ryujinx.HLE/Gpu/Engines/NvGpuEngine3dReg.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     enum NvGpuEngine3dReg
     {

Ryujinx.HLE/Gpu/Engines/NvGpuEngineDma.cs

@@ -1,6 +1,8 @@
+using Ryujinx.HLE.Gpu.Memory;
+using Ryujinx.HLE.Gpu.Texture;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     class NvGpuEngineDma : INvGpuEngine
     {

Ryujinx.HLE/Gpu/Engines/NvGpuEngineDmaReg.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     enum NvGpuEngineDmaReg
     {

Ryujinx.HLE/Gpu/Engines/NvGpuFifo.cs

@@ -1,6 +1,7 @@
+using Ryujinx.HLE.Gpu.Memory;
 using System.Collections.Concurrent;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     class NvGpuFifo
     {

Ryujinx.HLE/Gpu/Engines/NvGpuFifoMeth.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Engines
 {
     enum NvGpuFifoMeth
     {

Ryujinx.HLE/Gpu/Engines/NvGpuMethod.cs

@@ -1,4 +1,6 @@
-namespace Ryujinx.HLE.Gpu
+using Ryujinx.HLE.Gpu.Memory;
+
+namespace Ryujinx.HLE.Gpu.Engines
 {
     delegate void NvGpuMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry);
 }

Ryujinx.HLE/Gpu/Exceptions/GpuException.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Ryujinx.HLE.Gpu.Exceptions
+{
+    class GpuException : Exception
+    {
+        public GpuException() : base() { }
+
+        public GpuException(string ExMsg) : base(ExMsg) { }
+    }
+}

Ryujinx.HLE/Gpu/Exceptions/GpuExceptionHelper.cs

@@ -0,0 +1,12 @@
+namespace Ryujinx.HLE.Gpu.Exceptions
+{
+    static class GpuExceptionHelper
+    {
+        private const string CallCountExceeded = "Method call count exceeded the limit allowed per run!";
+
+        public static void ThrowCallCoundExceeded()
+        {
+            throw new GpuException(CallCountExceeded);
+        }
+    }
+}

Ryujinx.HLE/Gpu/GpuMacroException.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace Ryujinx.HLE.Gpu
-{
-    class GpuMacroException : Exception
-    {
-        public GpuMacroException() : base() { }
-
-        public GpuMacroException(string ExMsg) : base(ExMsg) { }
-    }
-}

Ryujinx.HLE/Gpu/GpuMacroExceptionMsgs.cs

@@ -1,7 +0,0 @@
-namespace Ryujinx.HLE.Gpu
-{
-    static class GpuMacroExceptionMsgs
-    {
-        public const string CallCountExceeded = "Method call count exceeded the limit allowed per run!";
-    }
-}

Ryujinx.HLE/Gpu/Memory/NvGpuBufferType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Memory
 {
     enum NvGpuBufferType
     {

Ryujinx.HLE/Gpu/Memory/NvGpuPBEntry.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Memory
 {
     struct NvGpuPBEntry
     {

Ryujinx.HLE/Gpu/Memory/NvGpuPushBuffer.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Memory
 {
     static class NvGpuPushBuffer
     {

Ryujinx.HLE/Gpu/Memory/NvGpuVmm.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System.Collections.Concurrent;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Memory
 {
     class NvGpuVmm : IAMemory, IGalMemory
     {

Ryujinx.HLE/Gpu/Memory/NvGpuVmmCache.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Memory
 {
     class NvGpuVmmCache
     {

Ryujinx.HLE/Gpu/NvGpu.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Graphics.Gal;
+using Ryujinx.HLE.Gpu.Engines;
 
 namespace Ryujinx.HLE.Gpu
 {

Ryujinx.HLE/Gpu/Texture/BlockLinearSwizzle.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     class BlockLinearSwizzle : ISwizzle
     {

Ryujinx.HLE/Gpu/Texture/ISwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     interface ISwizzle
     {

Ryujinx.HLE/Gpu/Texture/LinearSwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     class LinearSwizzle : ISwizzle
     {

Ryujinx.HLE/Gpu/Texture/TextureFactory.cs

@@ -1,7 +1,8 @@
 using Ryujinx.Graphics.Gal;
+using Ryujinx.HLE.Gpu.Memory;
 using System;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     static class TextureFactory
     {
@@ -61,7 +62,7 @@ namespace Ryujinx.HLE.Gpu
             int Width  = (Tic[4] & 0xffff) + 1;
             int Height = (Tic[5] & 0xffff) + 1;
 
-            Texture Texture = new Texture(
+            TextureInfo Texture = new TextureInfo(
                 TextureAddress,
                 Width,
                 Height,

Ryujinx.HLE/Gpu/Texture/TextureHelper.cs

@@ -1,12 +1,13 @@
 using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
+using Ryujinx.HLE.Gpu.Memory;
 using System;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     static class TextureHelper
     {
-        public static ISwizzle GetSwizzle(Texture Texture, int Width, int Bpp)
+        public static ISwizzle GetSwizzle(TextureInfo Texture, int Width, int Bpp)
         {
             switch (Texture.Swizzle)
             {

Ryujinx.HLE/Gpu/Texture/TextureInfo.cs

@@ -1,8 +1,8 @@
 using Ryujinx.Graphics.Gal;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
-    struct Texture
+    struct TextureInfo
     {
         public long Position { get; private set; }
 
@@ -16,7 +16,7 @@ namespace Ryujinx.HLE.Gpu
 
         public GalTextureFormat Format { get; private set; }
 
-        public Texture(
+        public TextureInfo(
             long Position,
             int  Width,
             int  Height)
@@ -34,7 +34,7 @@ namespace Ryujinx.HLE.Gpu
             Format = GalTextureFormat.A8B8G8R8;
         }
 
-        public Texture(
+        public TextureInfo(
             long             Position,
             int              Width,
             int              Height,

Ryujinx.HLE/Gpu/Texture/TextureReader.cs

@@ -2,11 +2,11 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     static class TextureReader
     {
-        public static byte[] Read(IAMemory Memory, Texture Texture)
+        public static byte[] Read(IAMemory Memory, TextureInfo Texture)
         {
             switch (Texture.Format)
             {
@@ -31,7 +31,7 @@ namespace Ryujinx.HLE.Gpu
             throw new NotImplementedException(Texture.Format.ToString());
         }
 
-        private unsafe static byte[] Read1Bpp(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read1Bpp(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = Texture.Width;
             int Height = Texture.Height;
@@ -64,7 +64,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read5551(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read5551(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = Texture.Width;
             int Height = Texture.Height;
@@ -102,7 +102,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read565(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read565(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = Texture.Width;
             int Height = Texture.Height;
@@ -139,7 +139,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read2Bpp(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read2Bpp(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = Texture.Width;
             int Height = Texture.Height;
@@ -172,7 +172,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read4Bpp(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read4Bpp(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = Texture.Width;
             int Height = Texture.Height;
@@ -205,7 +205,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read8Bpp(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read8Bpp(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = Texture.Width;
             int Height = Texture.Height;
@@ -238,7 +238,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read16Bpp(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read16Bpp(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = Texture.Width;
             int Height = Texture.Height;
@@ -273,7 +273,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read8Bpt4x4(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read8Bpt4x4(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = (Texture.Width  + 3) / 4;
             int Height = (Texture.Height + 3) / 4;
@@ -306,7 +306,7 @@ namespace Ryujinx.HLE.Gpu
             return Output;
         }
 
-        private unsafe static byte[] Read16Bpt4x4(IAMemory Memory, Texture Texture)
+        private unsafe static byte[] Read16Bpt4x4(IAMemory Memory, TextureInfo Texture)
         {
             int Width  = (Texture.Width  + 3) / 4;
             int Height = (Texture.Height + 3) / 4;

Ryujinx.HLE/Gpu/Texture/TextureSwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     enum TextureSwizzle
     {

Ryujinx.HLE/Gpu/Texture/TextureWriter.cs

@@ -2,16 +2,16 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.HLE.Gpu
+namespace Ryujinx.HLE.Gpu.Texture
 {
     static class TextureWriter
     {
         public static void Write(
-            IAMemory Memory,
+            IAMemory    Memory,
-            Texture  Texture,
+            TextureInfo Texture,
-            byte[]   Data,
+            byte[]      Data,
-            int      Width,
+            int         Width,
-            int      Height)
+            int         Height)
         {
             switch (Texture.Format)
             {
@@ -22,11 +22,11 @@ namespace Ryujinx.HLE.Gpu
         }
 
         private unsafe static void Write4Bpp(
-            IAMemory Memory,
+            IAMemory    Memory,
-            Texture  Texture,
+            TextureInfo Texture,
-            byte[]   Data,
+            byte[]      Data,
-            int      Width,
+            int         Width,
-            int      Height)
+            int         Height)
         {
             ISwizzle Swizzle = TextureHelper.GetSwizzle(Texture, Width, 4);
 

Ryujinx.HLE/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs

@@ -1,5 +1,5 @@
 using ChocolArm64.Memory;
-using Ryujinx.HLE.Gpu;
+using Ryujinx.HLE.Gpu.Memory;
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Services.Nv.NvMap;
 using System;

Ryujinx.HLE/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs

@@ -1,5 +1,5 @@
 using ChocolArm64.Memory;
-using Ryujinx.HLE.Gpu;
+using Ryujinx.HLE.Gpu.Memory;
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Services.Nv.NvGpuAS;
 using System;

Ryujinx.HLE/OsHle/Services/Nv/NvMap/NvMapIoctl.cs

@@ -1,5 +1,5 @@
 using ChocolArm64.Memory;
-using Ryujinx.HLE.Gpu;
+using Ryujinx.HLE.Gpu.Memory;
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Utilities;
 using System.Collections.Concurrent;

Ryujinx.HLE/OsHle/Services/Vi/NvFlinger.cs

@@ -1,5 +1,5 @@
 using Ryujinx.Graphics.Gal;
-using Ryujinx.HLE.Gpu;
+using Ryujinx.HLE.Gpu.Texture;
 using Ryujinx.HLE.Logging;
 using Ryujinx.HLE.OsHle.Handles;
 using Ryujinx.HLE.OsHle.Services.Nv.NvMap;
@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
+
 using static Ryujinx.HLE.OsHle.Services.Android.Parcel;
 
 namespace Ryujinx.HLE.OsHle.Services.Android
@@ -353,7 +354,7 @@ namespace Ryujinx.HLE.OsHle.Services.Android
             {
                 //Frame buffer is not set on the GPU registers, in this case
                 //assume that the app is manually writing to it.
-                Texture Texture = new Texture(FbAddr, FbWidth, FbHeight);
+                TextureInfo Texture = new TextureInfo(FbAddr, FbWidth, FbHeight);
 
                 byte[] Data = TextureReader.Read(Context.Memory, Texture);
 

Ryujinx/Ui/Program.cs

@@ -14,7 +14,7 @@ namespace Ryujinx
         {
             Console.Title = "Ryujinx Console";
 
-            IGalRenderer Renderer = new OpenGLRenderer();
+            IGalRenderer Renderer = new OGLRenderer();
 
             IAalOutput AudioOut = new OpenALAudioOut();