diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-05-28 01:50:11 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-07-06 05:37:55 +0200 |
commit | 8155b12d3d8963ec4d8727614ffb522a33389cbf (patch) | |
tree | 99ca355ef1c1bdecc990ddd76ac460e500133717 /src/video_core/renderer_opengl/gl_buffer_cache.h | |
parent | gl_buffer_cache: Store in CachedBufferEntry the used buffer handle (diff) | |
download | yuzu-8155b12d3d8963ec4d8727614ffb522a33389cbf.tar yuzu-8155b12d3d8963ec4d8727614ffb522a33389cbf.tar.gz yuzu-8155b12d3d8963ec4d8727614ffb522a33389cbf.tar.bz2 yuzu-8155b12d3d8963ec4d8727614ffb522a33389cbf.tar.lz yuzu-8155b12d3d8963ec4d8727614ffb522a33389cbf.tar.xz yuzu-8155b12d3d8963ec4d8727614ffb522a33389cbf.tar.zst yuzu-8155b12d3d8963ec4d8727614ffb522a33389cbf.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_buffer_cache.h')
-rw-r--r-- | src/video_core/renderer_opengl/gl_buffer_cache.h | 70 |
1 files changed, 52 insertions, 18 deletions
diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h index 4a055035a..00bc6008a 100644 --- a/src/video_core/renderer_opengl/gl_buffer_cache.h +++ b/src/video_core/renderer_opengl/gl_buffer_cache.h @@ -5,9 +5,12 @@ #pragma once #include <cstddef> +#include <map> #include <memory> #include <tuple> +#include <unordered_set> #include <utility> +#include <vector> #include "common/common_types.h" #include "video_core/rasterizer_cache.h" @@ -20,8 +23,7 @@ class RasterizerOpenGL; class CachedBufferEntry final : public RasterizerCacheObject { public: - explicit CachedBufferEntry(VAddr cpu_addr, u8* host_ptr, std::size_t size, - std::size_t alignment, GLuint buffer, GLintptr offset); + explicit CachedBufferEntry(VAddr cpu_addr, u8* host_ptr); VAddr GetCpuAddr() const override { return cpu_addr; @@ -35,55 +37,87 @@ public: return size; } - std::size_t GetAlignment() const { - return alignment; + std::size_t GetCapacity() const { + return capacity; + } + + bool IsInternalized() const { + return is_internal; } GLuint GetBuffer() const { - return buffer; + return buffer.handle; + } + + void SetSize(std::size_t new_size) { + size = new_size; + } + + void SetInternalState(bool is_internal_) { + is_internal = is_internal_; } - GLintptr GetOffset() const { - return offset; + void SetCapacity(OGLBuffer&& new_buffer, std::size_t new_capacity) { + capacity = new_capacity; + buffer = std::move(new_buffer); } private: VAddr cpu_addr{}; std::size_t size{}; - std::size_t alignment{}; - - GLuint buffer{}; - GLintptr offset{}; + std::size_t capacity{}; + bool is_internal{}; + OGLBuffer buffer; }; class OGLBufferCache final : public RasterizerCache<std::shared_ptr<CachedBufferEntry>> { + using BufferInfo = std::pair<GLuint, GLintptr>; + public: explicit OGLBufferCache(RasterizerOpenGL& rasterizer, std::size_t size); + ~OGLBufferCache(); + + void Unregister(const std::shared_ptr<CachedBufferEntry>& entry) override; /// Uploads data from a guest GPU address. Returns the OpenGL buffer where it's located and its /// offset. - std::pair<GLuint, GLintptr> UploadMemory(GPUVAddr gpu_addr, std::size_t size, - std::size_t alignment = 4, bool cache = true); + BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, std::size_t alignment = 4, + bool internalize = false); /// Uploads from a host memory. Returns the OpenGL buffer where it's located and its offset. - std::pair<GLuint, GLintptr> UploadHostMemory(const void* raw_pointer, std::size_t size, - std::size_t alignment = 4); + BufferInfo UploadHostMemory(const void* raw_pointer, std::size_t size, + std::size_t alignment = 4); bool Map(std::size_t max_size); void Unmap(); protected: - void AlignBuffer(std::size_t alignment); - // We do not have to flush this cache as things in it are never modified by us. void FlushObjectInner(const std::shared_ptr<CachedBufferEntry>& object) override {} private: - OGLStreamBuffer stream_buffer; + BufferInfo StreamBufferUpload(const void* raw_pointer, std::size_t size, std::size_t alignment); + + BufferInfo FixedBufferUpload(GPUVAddr gpu_addr, u8* host_ptr, std::size_t size, + bool internalize); + + void GrowBuffer(std::shared_ptr<CachedBufferEntry>& entry, std::size_t new_size); + + std::shared_ptr<CachedBufferEntry> GetUncachedBuffer(VAddr cpu_addr, u8* host_ptr); + + std::shared_ptr<CachedBufferEntry> TryGetReservedBuffer(u8* host_ptr); + + void ReserveBuffer(std::shared_ptr<CachedBufferEntry> entry); + + void AlignBuffer(std::size_t alignment); u8* buffer_ptr = nullptr; GLintptr buffer_offset = 0; GLintptr buffer_offset_base = 0; + + OGLStreamBuffer stream_buffer; + std::unordered_set<CacheAddr> internalized_entries; + std::unordered_map<CacheAddr, std::vector<std::shared_ptr<CachedBufferEntry>>> buffer_reserve; }; } // namespace OpenGL |