From 24d316cc92787f2b42610d22e9780b160fb68d59 Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Thu, 3 Dec 2020 19:34:27 +0000
Subject: [PATCH] Extract texture Target from Info for quick access (#1774)

---
 Ryujinx.Graphics.Gpu/Image/Texture.cs          | 18 ++++++++++++------
 .../Image/TextureBindingsManager.cs            |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs
index 45a27051..ae7fa6cf 100644
--- a/Ryujinx.Graphics.Gpu/Image/Texture.cs
+++ b/Ryujinx.Graphics.Gpu/Image/Texture.cs
@@ -30,6 +30,11 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public Format Format => Info.FormatInfo.Format;
 
+        /// <summary>
+        /// Texture target.
+        /// </summary>
+        public Target Target { get; private set; }
+
         /// <summary>
         /// Texture information.
         /// </summary>
@@ -290,7 +295,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             width  <<= _firstLevel;
             height <<= _firstLevel;
 
-            if (Info.Target == Target.Texture3D)
+            if (Target == Target.Texture3D)
             {
                 depthOrLayers <<= _firstLevel;
             }
@@ -532,7 +537,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public void SynchronizeMemory()
         {
-            if (Info.Target == Target.TextureBuffer)
+            if (Target == Target.TextureBuffer)
             {
                 return;
             }
@@ -653,11 +658,11 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 data = decoded;
             }
-            else if (Info.Target == Target.Texture3D && Info.FormatInfo.Format.IsBc4())
+            else if (Target == Target.Texture3D && Info.FormatInfo.Format.IsBc4())
             {
                 data = BCnDecoder.DecodeBC4(data, Info.Width, Info.Height, _depth, Info.Levels, _layers, Info.FormatInfo.Format == Format.Bc4Snorm);
             }
-            else if (Info.Target == Target.Texture3D && Info.FormatInfo.Format.IsBc5())
+            else if (Target == Target.Texture3D && Info.FormatInfo.Format.IsBc5())
             {
                 data = BCnDecoder.DecodeBC5(data, Info.Width, Info.Height, _depth, Info.Levels, _layers, Info.FormatInfo.Format == Format.Bc5Snorm);
             }
@@ -760,7 +765,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                 }
             }
 
-            if (Info.Target != Target.TextureBuffer)
+            if (Target != Target.TextureBuffer)
             {
                 if (Info.IsLinear)
                 {
@@ -903,7 +908,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <returns>A view of this texture with the requested target, or null if the target is invalid for this texture</returns>
         public ITexture GetTargetTexture(Target target)
         {
-            if (target == Info.Target)
+            if (target == Target)
             {
                 return HostTexture;
             }
@@ -1008,6 +1013,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         private void SetInfo(TextureInfo info)
         {
             Info = info;
+            Target = info.Target;
 
             _depth  = info.GetDepth();
             _layers = info.GetLayers();
diff --git a/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs b/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs
index 8d44165c..9601b832 100644
--- a/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs
+++ b/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs
@@ -298,7 +298,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                     _context.Renderer.Pipeline.SetTexture(bindingInfo.Binding, hostTexture);
                 }
 
-                if (hostTexture != null && texture.Info.Target == Target.TextureBuffer)
+                if (hostTexture != null && texture.Target == Target.TextureBuffer)
                 {
                     // Ensure that the buffer texture is using the correct buffer as storage.
                     // Buffers are frequently re-created to accomodate larger data, so we need to re-bind
@@ -349,7 +349,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 ITexture hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
 
-                if (hostTexture != null && texture.Info.Target == Target.TextureBuffer)
+                if (hostTexture != null && texture.Target == Target.TextureBuffer)
                 {
                     // Ensure that the buffer texture is using the correct buffer as storage.
                     // Buffers are frequently re-created to accomodate larger data, so we need to re-bind