Fix cookie srgb #297

Author: Antoine Lelievre

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed issue with light layers bigger than 8 (and above the supported range). 
 - Fixed an issue where decals were duplicated in prefab isolation mode.
 - Fixed the valid TRS test failing due to variable not being initialized to the identity matrix in RTShadows (1220600).
+- Fixed cookie texture not updated when changing an import settings (srgb for example).
 
 ### Changed
 - Shadowmask and realtime reflection probe property are hide in Quality settings

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/Texture2DAtlas.cs

@@ -141,6 +141,7 @@ class Texture2DAtlas
         private AtlasAllocator m_AtlasAllocator = null;
         private Dictionary<int, Vector4> m_AllocationCache = new Dictionary<int, Vector4>();
         private Dictionary<int, uint> m_IsGPUTextureUpToDate = new Dictionary<int, uint>();
+        private Dictionary<int, int> m_TextureHashes = new Dictionary<int, int>();
 
         static readonly Vector4 fullScaleOffset = new Vector4(1, 1, 0, 0);
 
@@ -278,6 +279,7 @@ public virtual bool AllocateTextureWithoutBlit(int instanceId, int width, int he
                 scaleOffset.Scale(new Vector4(1.0f / m_Width, 1.0f / m_Height, 1.0f / m_Width, 1.0f / m_Height));
                 m_AllocationCache.Add(instanceId, scaleOffset);
                 MarkGPUTextureInvalid(instanceId); // the texture data haven't been uploaded
+                m_TextureHashes[instanceId] = -1;
                 return true;
             }
             else
@@ -289,10 +291,29 @@ public virtual bool AllocateTextureWithoutBlit(int instanceId, int width, int he
         public bool IsCached(out Vector4 scaleOffset, Texture texture)
             => m_AllocationCache.TryGetValue(texture.GetInstanceID(), out scaleOffset);
 
+        protected int GetTextureHash(Texture texture)
+        {
+            int hash = texture.GetHashCode();
+
+            unchecked
+            {
+                hash = hash * 23 + texture.graphicsFormat.GetHashCode();
+                hash = hash * 23 + texture.wrapMode.GetHashCode();
+                hash = hash * 23 + texture.width.GetHashCode();
+                hash = hash * 23 + texture.height.GetHashCode();
+                hash = hash * 23 + texture.filterMode.GetHashCode();
+                hash = hash * 23 + texture.anisoLevel.GetHashCode();
+                hash = hash * 23 + texture.mipmapCount.GetHashCode();
+            }
+
+            return hash;
+        }
+
         public virtual bool NeedsUpdate(Texture texture, bool needMips = false)
         {
             RenderTexture   rt = texture as RenderTexture;
             int             key = texture.GetInstanceID();
+            int             textureHash = GetTextureHash(texture);
 
             // Update the render texture if needed
             if (rt != null)
@@ -309,6 +330,12 @@ public virtual bool NeedsUpdate(Texture texture, bool needMips = false)
                     m_IsGPUTextureUpToDate[key] = rt.updateCount;
                 }
             }
+            // In case the texture settings/import settings have changed, we need to update it
+            else if (m_TextureHashes.TryGetValue(key, out int hash) && hash != textureHash)
+            {
+                m_TextureHashes[key] = textureHash;
+                return true;
+            }
             // For regular textures, values == 0 means that their GPU data needs to be updated (either because
             // the atlas have been re-layouted or the texture have never been uploaded. We also check if the mips
             // are valid for the texture if we need them