From 1b4503c571d3b961efe74fa7e35d5fa14941ec09 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 24 Apr 2019 16:35:54 -0300
Subject: texture_cache: Split texture cache into different files

---
 src/video_core/texture_cache/surface_view.h | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/video_core/texture_cache/surface_view.h

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

diff --git a/src/video_core/texture_cache/surface_view.h b/src/video_core/texture_cache/surface_view.h
new file mode 100644
index 000000000..e73d8f6ae
--- /dev/null
+++ b/src/video_core/texture_cache/surface_view.h
@@ -0,0 +1,35 @@
+// Copyright 2019 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+
+#include "common/common_types.h"
+
+namespace VideoCommon {
+
+struct ViewKey {
+    std::size_t Hash() const;
+
+    bool operator==(const ViewKey& rhs) const;
+
+    u32 base_layer{};
+    u32 num_layers{};
+    u32 base_level{};
+    u32 num_levels{};
+};
+
+} // namespace VideoCommon
+
+namespace std {
+
+template <>
+struct hash<VideoCommon::ViewKey> {
+    std::size_t operator()(const VideoCommon::ViewKey& k) const noexcept {
+        return k.Hash();
+    }
+};
+
+} // namespace std
-- 
cgit v1.2.3


From 3d471e732d688c20aef73a506bdb6126002d3193 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Tue, 7 May 2019 10:56:45 -0400
Subject: Correct Surface Base and Views for new Texture Cache

---
 src/video_core/texture_cache/surface_view.h | 35 +++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

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

diff --git a/src/video_core/texture_cache/surface_view.h b/src/video_core/texture_cache/surface_view.h
index e73d8f6ae..c122800a6 100644
--- a/src/video_core/texture_cache/surface_view.h
+++ b/src/video_core/texture_cache/surface_view.h
@@ -7,18 +7,45 @@
 #include <functional>
 
 #include "common/common_types.h"
+#include "video_core/surface.h"
+#include "video_core/texture_cache/surface_params.h"
 
 namespace VideoCommon {
 
-struct ViewKey {
+struct ViewParams {
     std::size_t Hash() const;
 
-    bool operator==(const ViewKey& rhs) const;
+    bool operator==(const ViewParams& rhs) const;
 
     u32 base_layer{};
     u32 num_layers{};
     u32 base_level{};
     u32 num_levels{};
+    VideoCore::Surface::SurfaceTarget target;
+    bool IsLayered() const {
+        switch (target) {
+        case VideoCore::Surface::SurfaceTarget::Texture1DArray:
+        case VideoCore::Surface::SurfaceTarget::Texture2DArray:
+        case VideoCore::Surface::SurfaceTarget::TextureCubemap:
+        case VideoCore::Surface::SurfaceTarget::TextureCubeArray:
+            return true;
+        default:
+            return false;
+        }
+    }
+};
+
+class ViewBase {
+public:
+    ViewBase(const ViewParams& params) : params{params} {}
+    ~ViewBase() = default;
+
+    const ViewParams& GetViewParams() const {
+        return params;
+    }
+
+protected:
+    ViewParams params;
 };
 
 } // namespace VideoCommon
@@ -26,8 +53,8 @@ struct ViewKey {
 namespace std {
 
 template <>
-struct hash<VideoCommon::ViewKey> {
-    std::size_t operator()(const VideoCommon::ViewKey& k) const noexcept {
+struct hash<VideoCommon::ViewParams> {
+    std::size_t operator()(const VideoCommon::ViewParams& k) const noexcept {
         return k.Hash();
     }
 };
-- 
cgit v1.2.3


From 549fd18ac44c6bcefdf6584484d775f0129e3fe3 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 7 May 2019 22:03:33 -0300
Subject: surface_view: Add constructor for ViewParams

---
 src/video_core/texture_cache/surface_view.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/src/video_core/texture_cache/surface_view.h b/src/video_core/texture_cache/surface_view.h
index c122800a6..1ef4509ce 100644
--- a/src/video_core/texture_cache/surface_view.h
+++ b/src/video_core/texture_cache/surface_view.h
@@ -13,15 +13,21 @@
 namespace VideoCommon {
 
 struct ViewParams {
+    ViewParams(VideoCore::Surface::SurfaceTarget target, u32 base_layer, u32 num_layers,
+               u32 base_level, u32 num_levels)
+        : target{target}, base_layer{base_layer}, num_layers{num_layers}, base_level{base_level},
+          num_levels{num_levels} {}
+
     std::size_t Hash() const;
 
     bool operator==(const ViewParams& rhs) const;
 
+    VideoCore::Surface::SurfaceTarget target{};
     u32 base_layer{};
     u32 num_layers{};
     u32 base_level{};
     u32 num_levels{};
-    VideoCore::Surface::SurfaceTarget target;
+
     bool IsLayered() const {
         switch (target) {
         case VideoCore::Surface::SurfaceTarget::Texture1DArray:
-- 
cgit v1.2.3


From 34841a41c308aa1336f71fbce3006302452302d1 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 24 Jun 2019 02:09:56 -0300
Subject: texture_cache/surface_view: Address feedback

---
 src/video_core/texture_cache/surface_view.h | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/src/video_core/texture_cache/surface_view.h b/src/video_core/texture_cache/surface_view.h
index 1ef4509ce..04ca5639b 100644
--- a/src/video_core/texture_cache/surface_view.h
+++ b/src/video_core/texture_cache/surface_view.h
@@ -44,7 +44,6 @@ struct ViewParams {
 class ViewBase {
 public:
     ViewBase(const ViewParams& params) : params{params} {}
-    ~ViewBase() = default;
 
     const ViewParams& GetViewParams() const {
         return params;
-- 
cgit v1.2.3