From d86f9cd70910d4b96ec301e7d532b11d18a290a4 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Tue, 7 May 2019 17:30:36 -0400
Subject: Change texture_cache chaching from GPUAddr to CacheAddr

This also reverses the changes to make invalidation and flushing through
the GPU address.
---
 src/video_core/texture_cache/surface_base.h | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/video_core/texture_cache/surface_base.h')

diff --git a/src/video_core/texture_cache/surface_base.h b/src/video_core/texture_cache/surface_base.h
index 9c048eb88..74be3237d 100644
--- a/src/video_core/texture_cache/surface_base.h
+++ b/src/video_core/texture_cache/surface_base.h
@@ -45,40 +45,40 @@ class SurfaceBaseImpl {
 public:
     void LoadBuffer(Tegra::MemoryManager& memory_manager, std::vector<u8>& staging_buffer);
 
-    void FlushBuffer(std::vector<u8>& staging_buffer);
+    void FlushBuffer(Tegra::MemoryManager& memory_manager, std::vector<u8>& staging_buffer);
 
     GPUVAddr GetGpuAddr() const {
         return gpu_addr;
     }
 
-    GPUVAddr GetGpuAddrEnd() const {
-        return gpu_addr_end;
-    }
-
-    bool Overlaps(const GPUVAddr start, const GPUVAddr end) const {
-        return (gpu_addr < end) && (gpu_addr_end > start);
+    bool Overlaps(const CacheAddr start, const CacheAddr end) const {
+        return (cache_addr < end) && (cache_addr_end > start);
     }
 
     // Use only when recycling a surface
     void SetGpuAddr(const GPUVAddr new_addr) {
         gpu_addr = new_addr;
-        gpu_addr_end = new_addr + memory_size;
     }
 
     VAddr GetCpuAddr() const {
-        return gpu_addr;
+        return cpu_addr;
     }
 
     void SetCpuAddr(const VAddr new_addr) {
         cpu_addr = new_addr;
     }
 
-    u8* GetHostPtr() const {
-        return host_ptr;
+    CacheAddr GetCacheAddr() const {
+        return cache_addr;
+    }
+
+    CacheAddr GetCacheAddrEnd() const {
+        return cache_addr_end;
     }
 
-    void SetHostPtr(u8* new_addr) {
-        host_ptr = new_addr;
+    void SetCacheAddr(const CacheAddr new_addr) {
+        cache_addr = new_addr;
+        cache_addr_end = new_addr + memory_size;
     }
 
     const SurfaceParams& GetSurfaceParams() const {
@@ -201,13 +201,13 @@ protected:
 
     const SurfaceParams params;
     GPUVAddr gpu_addr{};
-    GPUVAddr gpu_addr_end{};
     std::vector<u32> mipmap_sizes;
     std::vector<u32> mipmap_offsets;
     const std::size_t layer_size;
     const std::size_t memory_size;
     const std::size_t host_memory_size;
-    u8* host_ptr;
+    CacheAddr cache_addr;
+    CacheAddr cache_addr_end{};
     VAddr cpu_addr;
 
 private:
-- 
cgit v1.2.3