From 4b396f375c0d32b60595f224d06b1b63d6df6b0a Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 16 Apr 2019 20:01:07 -0300
Subject: gl_texture_cache: Minor changes

---
 src/video_core/renderer_opengl/gl_texture_cache.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/video_core/renderer_opengl/gl_texture_cache.h')

diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h
index 86ad91dab..8705db74c 100644
--- a/src/video_core/renderer_opengl/gl_texture_cache.h
+++ b/src/video_core/renderer_opengl/gl_texture_cache.h
@@ -27,6 +27,7 @@ using VideoCore::Surface::SurfaceType;
 class CachedSurfaceView;
 class CachedSurface;
 
+using Surface = std::shared_ptr<CachedSurface>;
 using TextureCacheBase = VideoCommon::TextureCacheContextless<CachedSurface, CachedSurfaceView>;
 
 class CachedSurface final : public VideoCommon::SurfaceBaseContextless<CachedSurfaceView> {
@@ -47,6 +48,8 @@ public:
     }
 
 protected:
+    void DecorateSurfaceName();
+
     std::unique_ptr<CachedSurfaceView> CreateView(const ViewKey& view_key);
 
     void FlushBufferImpl();
@@ -65,7 +68,6 @@ private:
     OGLTexture texture;
 
     std::vector<u8> staging_buffer;
-    u8* host_ptr{};
 };
 
 class CachedSurfaceView final {
@@ -155,19 +157,21 @@ public:
     ~TextureCacheOpenGL();
 
 protected:
-    CachedSurfaceView* TryFastGetSurfaceView(VAddr cpu_addr, u8* host_ptr,
+    CachedSurfaceView* TryFastGetSurfaceView(GPUVAddr gpu_addr, VAddr cpu_addr, u8* host_ptr,
                                              const SurfaceParams& new_params,
                                              bool preserve_contents,
-                                             const std::vector<CachedSurface*>& overlaps);
+                                             const std::vector<Surface>& overlaps);
 
-    std::unique_ptr<CachedSurface> CreateSurface(const SurfaceParams& params);
+    Surface CreateSurface(const SurfaceParams& params);
 
 private:
-    CachedSurfaceView* SurfaceCopy(VAddr cpu_addr, u8* host_ptr, const SurfaceParams& new_params,
-                                   CachedSurface* old_surface, const SurfaceParams& old_params);
+    CachedSurfaceView* SurfaceCopy(GPUVAddr gpu_addr, VAddr cpu_addr, u8* host_ptr,
+                                   const SurfaceParams& new_params, const Surface& old_surface,
+                                   const SurfaceParams& old_params);
 
-    CachedSurfaceView* TryCopyAsViews(VAddr cpu_addr, u8* host_ptr, const SurfaceParams& new_params,
-                                      const std::vector<CachedSurface*>& overlaps);
+    CachedSurfaceView* TryCopyAsViews(GPUVAddr gpu_addr, VAddr cpu_addr, u8* host_ptr,
+                                      const SurfaceParams& new_params,
+                                      const std::vector<Surface>& overlaps);
 };
 
 } // namespace OpenGL
-- 
cgit v1.2.3