From cda659955ced1b16839cdd1e7fea1ef6f8d99041 Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Sun, 9 Jan 2022 16:28:48 +0000
Subject: Texture Sync, incompatible overlap handling, data flush improvements.
 (#2971)

* Initial test for texture sync

* WIP new texture flushing setup

* Improve rules for incompatible overlaps

Fixes a lot of issues with Unreal Engine games. Still a few minor issues (some caused by dma fast path?) Needs docs and cleanup.

* Cleanup, improvements

Improve rules for fast DMA

* Small tweak to group together flushes of overlapping handles.

* Fixes, flush overlapping texture data for ASTC and BC4/5 compressed textures.

Fixes the new Life is Strange game.

* Flush overlaps before init data, fix 3d texture size/overlap stuff

* Fix 3D Textures, faster single layer flush

Note: nosy people can no longer merge this with Vulkan. (unless they are nosy enough to implement the new backend methods)

* Remove unused method

* Minor cleanup

* More cleanup

* Use the More Fun and Hopefully No Driver Bugs method for getting compressed tex too

This one's for metro

* Address feedback, ASTC+ETC to FormatClass

* Change offset to use Span slice rather than IntPtr Add

* Fix this too
---
 .../Memory/MultiRangeWritableBlock.cs              | 58 ++++++++++++++++++++++
 Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs      | 32 ++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 Ryujinx.Graphics.Gpu/Memory/MultiRangeWritableBlock.cs

(limited to 'Ryujinx.Graphics.Gpu/Memory')

diff --git a/Ryujinx.Graphics.Gpu/Memory/MultiRangeWritableBlock.cs b/Ryujinx.Graphics.Gpu/Memory/MultiRangeWritableBlock.cs
new file mode 100644
index 00000000..155dda7b
--- /dev/null
+++ b/Ryujinx.Graphics.Gpu/Memory/MultiRangeWritableBlock.cs
@@ -0,0 +1,58 @@
+using Ryujinx.Memory;
+using Ryujinx.Memory.Range;
+using System;
+
+namespace Ryujinx.Graphics.Gpu.Memory
+{
+    /// <summary>
+    /// A writable block that targets a given MultiRange within a PhysicalMemory instance.
+    /// </summary>
+    internal class MultiRangeWritableBlock : IWritableBlock
+    {
+        private readonly MultiRange _range;
+        private readonly PhysicalMemory _physicalMemory;
+
+        /// <summary>
+        /// Creates a new MultiRangeWritableBlock.
+        /// </summary>
+        /// <param name="range">The MultiRange to write to</param>
+        /// <param name="physicalMemory">The PhysicalMemory the given MultiRange addresses</param>
+        public MultiRangeWritableBlock(MultiRange range, PhysicalMemory physicalMemory)
+        {
+            _range = range;
+            _physicalMemory = physicalMemory;
+        }
+
+        /// <summary>
+        /// Write data to the MultiRange.
+        /// </summary>
+        /// <param name="va">Offset address</param>
+        /// <param name="data">Data to write</param>
+        /// <exception cref="ArgumentException">Throw when a non-zero offset is given</exception>
+        public void Write(ulong va, ReadOnlySpan<byte> data)
+        {
+            if (va != 0)
+            {
+                throw new ArgumentException($"{nameof(va)} cannot be non-zero for {nameof(MultiRangeWritableBlock)}.");
+            }
+
+            _physicalMemory.Write(_range, data);
+        }
+
+        /// <summary>
+        /// Write data to the MultiRange, without tracking.
+        /// </summary>
+        /// <param name="va">Offset address</param>
+        /// <param name="data">Data to write</param>
+        /// <exception cref="ArgumentException">Throw when a non-zero offset is given</exception>
+        public void WriteUntracked(ulong va, ReadOnlySpan<byte> data)
+        {
+            if (va != 0)
+            {
+                throw new ArgumentException($"{nameof(va)} cannot be non-zero for {nameof(MultiRangeWritableBlock)}.");
+            }
+
+            _physicalMemory.WriteUntracked(_range, data);
+        }
+    }
+}
diff --git a/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs b/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
index d292fab0..1ff086ee 100644
--- a/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
@@ -135,6 +135,38 @@ namespace Ryujinx.Graphics.Gpu.Memory
             return _cpuMemory.GetWritableRegion(address, size, tracked);
         }
 
+        /// <summary>
+        /// Gets a writable region from GPU mapped memory.
+        /// </summary>
+        /// <param name="range">Range</param>
+        /// <param name="tracked">True if write tracking is triggered on the span</param>
+        /// <returns>A writable region with the data at the specified memory location</returns>
+        public WritableRegion GetWritableRegion(MultiRange range, bool tracked = false)
+        {
+            if (range.Count == 1)
+            {
+                MemoryRange subrange = range.GetSubRange(0);
+
+                return GetWritableRegion(subrange.Address, (int)subrange.Size, tracked);
+            }
+            else
+            {
+                Memory<byte> memory = new byte[range.GetSize()];
+
+                int offset = 0;
+                for (int i = 0; i < range.Count; i++)
+                {
+                    MemoryRange subrange = range.GetSubRange(i);
+
+                    GetSpan(subrange.Address, (int)subrange.Size).CopyTo(memory.Span.Slice(offset, (int)subrange.Size));
+
+                    offset += (int)subrange.Size;
+                }
+
+                return new WritableRegion(new MultiRangeWritableBlock(range, this), 0, memory, tracked);
+            }
+        }
+
         /// <summary>
         /// Reads data from the application process.
         /// </summary>
-- 
cgit v1.2.3