shader cache: Fix invalid virtual address clean up (#1717)

* shader cache: Fix invalid virtual address clean up

This fix an issue causing the virtual address of texture descriptors to
not be cleaned up when caching and instead cleaning texture format and swizzle.

This should fix duplicate high duplication in the cache for certain
games and possible texture corruption issues.

**THIS WILL INVALIDATE ALL SHADER CACHE LEVELS CONSIDERING THE NATURE OF THE ISSUE**

* shader cache: Address gdk's comment

Ryujinx.Graphics.Gpu/Image/ITextureDescriptor.cs

@@ -0,0 +1,10 @@
+namespace Ryujinx.Graphics.Gpu.Image
+{
+    interface ITextureDescriptor
+    {
+        public uint UnpackFormat();
+        public TextureTarget UnpackTextureTarget();
+        public bool UnpackSrgb();
+        public bool UnpackTextureCoordNormalized();
+    }
+}

Ryujinx.Graphics.Gpu/Image/TextureDescriptor.cs

@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Gpu.Image
     /// <summary>
     /// Maxwell texture descriptor, as stored on the GPU texture pool memory region.
     /// </summary>
-    struct TextureDescriptor
+    struct TextureDescriptor : ITextureDescriptor
     {
 #pragma warning disable CS0649
         public uint Word0;
@@ -239,12 +239,12 @@ namespace Ryujinx.Graphics.Gpu.Image
             GuestTextureDescriptor result = new GuestTextureDescriptor
             {
                 Handle = uint.MaxValue,
-                Descriptor = this
+                Format = UnpackFormat(),
-            };
+                Target = UnpackTextureTarget(),
+                IsSrgb = UnpackSrgb(),
+                IsTextureCoordNormalized = UnpackTextureCoordNormalized(),
 
-            // Clear the virtual address
+            };
-            result.Descriptor.Word0 = 0;
-            result.Descriptor.Word2 &= 0xFFFF0000;
 
             return result;
         }

Ryujinx.Graphics.Gpu/Image/TextureTarget.cs

@@ -5,7 +5,7 @@ namespace Ryujinx.Graphics.Gpu.Image
     /// <summary>
     /// Texture target.
     /// </summary>
-    enum TextureTarget
+    enum TextureTarget : byte
     {
         Texture1D,
         Texture2D,

Ryujinx.Graphics.Gpu/Shader/Cache/CacheManager.cs

@@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache
         /// <summary>
         /// Version of the guest cache shader (to increment when guest cache structure change).
         /// </summary>
-        private const ulong GuestCacheVersion = 1;
+        private const ulong GuestCacheVersion = 1717;
 
         /// <summary>
         /// Create a new cache manager instance

Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestTextureDescriptor.cs

@@ -4,12 +4,38 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.Graphics.Gpu.Shader.Cache.Definition
 {
     /// <summary>
-    /// Mostly identical to TextureDescriptor from <see cref="Image"/> but we don't store the address of the texture and store its handle instead.
+    /// Contains part of TextureDescriptor from <see cref="Image"/> used for shader codegen.
     /// </summary>
-    [StructLayout(LayoutKind.Sequential, Size = 0x20, Pack = 1)]
+    [StructLayout(LayoutKind.Sequential, Size = 0xC, Pack = 1)]
-    struct GuestTextureDescriptor
+    struct GuestTextureDescriptor : ITextureDescriptor
     {
         public uint Handle;
-        internal TextureDescriptor Descriptor;
+        public uint Format;
+        public TextureTarget Target;
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsSrgb;
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsTextureCoordNormalized;
+        public byte Reserved;
+
+        public uint UnpackFormat()
+        {
+            return Format;
+        }
+
+        public bool UnpackSrgb()
+        {
+            return IsSrgb;
+        }
+
+        public bool UnpackTextureCoordNormalized()
+        {
+            return IsTextureCoordNormalized;
+        }
+
+        public TextureTarget UnpackTextureTarget()
+        {
+            return Target;
+        }
     }
 }

Ryujinx.Graphics.Gpu/Shader/CachedGpuAccessor.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private readonly GpuContext _context;
         private readonly ReadOnlyMemory<byte> _data;
         private readonly GuestGpuAccessorHeader _header;
-        private readonly Dictionary<int, Image.TextureDescriptor> _textureDescriptors;
+        private readonly Dictionary<int, GuestTextureDescriptor> _textureDescriptors;
 
         /// <summary>
         /// Creates a new instance of the cached GPU state accessor for shader translation.
@@ -26,11 +26,11 @@ namespace Ryujinx.Graphics.Gpu.Shader
             _context = context;
             _data = data;
             _header = header;
-            _textureDescriptors = new Dictionary<int, Image.TextureDescriptor>();
+            _textureDescriptors = new Dictionary<int, GuestTextureDescriptor>();
 
             foreach (KeyValuePair<int, GuestTextureDescriptor> guestTextureDescriptor in guestTextureDescriptors)
             {
-                _textureDescriptors.Add(guestTextureDescriptor.Key, guestTextureDescriptor.Value.Descriptor);
+                _textureDescriptors.Add(guestTextureDescriptor.Key, guestTextureDescriptor.Value);
             }
         }
 
@@ -141,9 +141,9 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// </summary>
         /// <param name="handle">Index of the texture (this is the word offset of the handle in the constant buffer)</param>
         /// <returns>Texture descriptor</returns>
-        public override Image.TextureDescriptor GetTextureDescriptor(int handle)
+        public override Image.ITextureDescriptor GetTextureDescriptor(int handle)
         {
-            if (!_textureDescriptors.TryGetValue(handle, out Image.TextureDescriptor textureDescriptor))
+            if (!_textureDescriptors.TryGetValue(handle, out GuestTextureDescriptor textureDescriptor))
             {
                 throw new ArgumentException();
             }

Ryujinx.Graphics.Gpu/Shader/GpuAccessor.cs

@@ -185,7 +185,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         /// </summary>
         /// <param name="handle">Index of the texture (this is the word offset of the handle in the constant buffer)</param>
         /// <returns>Texture descriptor</returns>
-        public override Image.TextureDescriptor GetTextureDescriptor(int handle)
+        public override Image.ITextureDescriptor GetTextureDescriptor(int handle)
         {
             if (_compute)
             {

Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -35,9 +35,9 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private Dictionary<Hash128, ShaderBundle> _cpProgramsDiskCache;
 
         /// <summary>
-        /// Version of the codegen (to be incremented when codegen changes).
+        /// Version of the codegen (to be changed when codegen or guest format change).
         /// </summary>
-        private const ulong ShaderCodeGenVersion = 1;
+        private const ulong ShaderCodeGenVersion = 1717;
 
         /// <summary>
         /// Creates a new instance of the shader cache.
@@ -888,7 +888,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
 
                 foreach (int textureHandle in textureHandlesInUse)
                 {
-                    GuestTextureDescriptor textureDescriptor = gpuAccessor.GetTextureDescriptor(textureHandle).ToCache();
+                    GuestTextureDescriptor textureDescriptor = ((Image.TextureDescriptor)gpuAccessor.GetTextureDescriptor(textureHandle)).ToCache();
 
                     textureDescriptor.Handle = (uint)textureHandle;
 

Ryujinx.Graphics.Gpu/Shader/TextureDescriptorCapableGpuAccessor.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
     {
         public abstract T MemoryRead<T>(ulong address) where T : unmanaged;
 
-        public abstract Image.TextureDescriptor GetTextureDescriptor(int handle);
+        public abstract ITextureDescriptor GetTextureDescriptor(int handle);
 
         /// <summary>
         /// Queries texture format information, for shaders using image load or store.