From f6d88558b1780df25088042771a75ab174f0a06c Mon Sep 17 00:00:00 2001
From: Mary <me@thog.eu>
Date: Tue, 1 Dec 2020 22:48:31 +0100
Subject: salieri: Fix missing guest GPU accessor missing on hashes (#1759)

This adds the guest GPU accessor to hashes computation.
As this change all the hashes from the cache, I added some migration
logic.

This is required for #1755.
---
 Ryujinx.Graphics.Gpu/Shader/Cache/Definition/CacheManifestHeader.cs | 6 +++---
 .../Shader/Cache/Definition/GuestShaderCacheEntry.cs                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Ryujinx.Graphics.Gpu/Shader/Cache/Definition')

diff --git a/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/CacheManifestHeader.cs b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/CacheManifestHeader.cs
index 3f198dca..0601451d 100644
--- a/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/CacheManifestHeader.cs
+++ b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/CacheManifestHeader.cs
@@ -84,14 +84,14 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache.Definition
         /// <summary>
         /// Check the validity of the header.
         /// </summary>
-        /// <param name="version">The target version in use</param>
         /// <param name="graphicsApi">The target graphics api in use</param>
         /// <param name="hashType">The target hash type in use</param>
         /// <param name="data">The data after this header</param>
         /// <returns>True if the header is valid</returns>
-        public bool IsValid(ulong version, CacheGraphicsApi graphicsApi, CacheHashType hashType, ReadOnlySpan<byte> data)
+        /// <remarks>This doesn't check that versions match</remarks>
+        public bool IsValid(CacheGraphicsApi graphicsApi, CacheHashType hashType, ReadOnlySpan<byte> data)
         {
-            return Version == version && GraphicsApi == graphicsApi && HashType == hashType && TableChecksum == CalculateCrc16(data);
+            return GraphicsApi == graphicsApi && HashType == hashType && TableChecksum == CalculateCrc16(data);
         }
     }
 }
diff --git a/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestShaderCacheEntry.cs b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestShaderCacheEntry.cs
index 45a442e2..373fa6c6 100644
--- a/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestShaderCacheEntry.cs
+++ b/Ryujinx.Graphics.Gpu/Shader/Cache/Definition/GuestShaderCacheEntry.cs
@@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache.Definition
         /// </summary>
         /// <param name="header">The header of the cached shader entry</param>
         /// <param name="code">The code of this shader</param>
-        private GuestShaderCacheEntry(GuestShaderCacheEntryHeader header, byte[] code)
+        public GuestShaderCacheEntry(GuestShaderCacheEntryHeader header, byte[] code)
         {
             Header = header;
             Code = code;
-- 
cgit v1.2.3