From 8098f3ba589428dfc0f380890cb85efb900b888b Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Fri, 19 Jul 2019 10:50:40 -0400
Subject: Video_Core: Implement a new Buffer Cache

---
 src/video_core/buffer_cache/buffer_block.h | 78 ++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/video_core/buffer_cache/buffer_block.h

(limited to 'src/video_core/buffer_cache/buffer_block.h')

diff --git a/src/video_core/buffer_cache/buffer_block.h b/src/video_core/buffer_cache/buffer_block.h
new file mode 100644
index 0000000000..2c739a5868
--- /dev/null
+++ b/src/video_core/buffer_cache/buffer_block.h
@@ -0,0 +1,78 @@
+// Copyright 2019 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <unordered_set>
+#include <utility>
+
+#include "common/alignment.h"
+#include "common/common_types.h"
+#include "video_core/gpu.h"
+
+namespace VideoCommon {
+
+class BufferBlock {
+public:
+    bool Overlaps(const CacheAddr start, const CacheAddr end) const {
+        return (cache_addr < end) && (cache_addr_end > start);
+    }
+
+    bool IsInside(const CacheAddr other_start, const CacheAddr other_end) {
+        return (cache_addr <= other_start && other_end <= cache_addr_end);
+    }
+
+    u8* GetWritableHostPtr() const {
+        return FromCacheAddr(cache_addr);
+    }
+
+    u8* GetWritableHostPtr(std::size_t offset) const {
+        return FromCacheAddr(cache_addr + offset);
+    }
+
+    std::size_t GetOffset(const CacheAddr in_addr) {
+        return static_cast<std::size_t>(in_addr - cache_addr);
+    }
+
+    CacheAddr GetCacheAddr() const {
+        return cache_addr;
+    }
+
+    CacheAddr GetCacheAddrEnd() const {
+        return cache_addr_end;
+    }
+
+    void SetCacheAddr(const CacheAddr new_addr) {
+        cache_addr = new_addr;
+        cache_addr_end = new_addr + size;
+    }
+
+    std::size_t GetSize() const {
+        return size;
+    }
+
+    void SetEpoch(u64 new_epoch) {
+        epoch = new_epoch;
+    }
+
+    u64 GetEpoch() {
+        return epoch;
+    }
+
+protected:
+    explicit BufferBlock(CacheAddr cache_addr,const std::size_t size)
+        : size{size} {
+        SetCacheAddr(cache_addr);
+    }
+    ~BufferBlock() = default;
+
+private:
+    CacheAddr cache_addr{};
+    CacheAddr cache_addr_end{};
+    u64 pages{};
+    std::size_t size{};
+    u64 epoch{};
+};
+
+} // namespace VideoCommon
-- 
cgit v1.2.3


From e1f3d5114f796c9748d4d0dd6c8e0e9449bc7edc Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Sat, 10 Aug 2019 12:50:38 -0400
Subject: Buffer Cache: Adress Feedback.

---
 src/video_core/buffer_cache/buffer_block.h       | 7 +++----
 src/video_core/renderer_opengl/gl_buffer_cache.h | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/video_core/buffer_cache/buffer_block.h')

diff --git a/src/video_core/buffer_cache/buffer_block.h b/src/video_core/buffer_cache/buffer_block.h
index 2c739a5868..d2124443fc 100644
--- a/src/video_core/buffer_cache/buffer_block.h
+++ b/src/video_core/buffer_cache/buffer_block.h
@@ -19,8 +19,8 @@ public:
         return (cache_addr < end) && (cache_addr_end > start);
     }
 
-    bool IsInside(const CacheAddr other_start, const CacheAddr other_end) {
-        return (cache_addr <= other_start && other_end <= cache_addr_end);
+    bool IsInside(const CacheAddr other_start, const CacheAddr other_end) const {
+        return cache_addr <= other_start && other_end <= cache_addr_end;
     }
 
     u8* GetWritableHostPtr() const {
@@ -61,8 +61,7 @@ public:
     }
 
 protected:
-    explicit BufferBlock(CacheAddr cache_addr,const std::size_t size)
-        : size{size} {
+    explicit BufferBlock(CacheAddr cache_addr, const std::size_t size) : size{size} {
         SetCacheAddr(cache_addr);
     }
     ~BufferBlock() = default;
diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h
index fb93f22dd2..022e7bfa9a 100644
--- a/src/video_core/renderer_opengl/gl_buffer_cache.h
+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h
@@ -54,13 +54,13 @@ protected:
     const GLuint* ToHandle(const Buffer& buffer) override;
 
     void UploadBlockData(const Buffer& buffer, std::size_t offset, std::size_t size,
-                          const u8* data) override;
+                         const u8* data) override;
 
     void DownloadBlockData(const Buffer& buffer, std::size_t offset, std::size_t size,
-                            u8* data) override;
+                           u8* data) override;
 
     void CopyBlock(const Buffer& src, const Buffer& dst, std::size_t src_offset,
-                        std::size_t dst_offset, std::size_t size) override;
+                   std::size_t dst_offset, std::size_t size) override;
 };
 
 } // namespace OpenGL
-- 
cgit v1.2.3