diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-06-16 03:29:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-16 03:29:32 +0200 |
commit | 0bd9bc7201568f1c1f6f0a0c425cff6229ffc597 (patch) | |
tree | 7a398409a2e8a03a4bf5246ac5bda06a6d7ef823 /src/video_core/renderer_vulkan/vk_buffer_cache.h | |
parent | Merge pull request #4085 from ReinUsesLisp/gcc-times (diff) | |
parent | buffer_cache: Avoid passing references of shared pointers and misc style changes (diff) | |
download | yuzu-0bd9bc7201568f1c1f6f0a0c425cff6229ffc597.tar yuzu-0bd9bc7201568f1c1f6f0a0c425cff6229ffc597.tar.gz yuzu-0bd9bc7201568f1c1f6f0a0c425cff6229ffc597.tar.bz2 yuzu-0bd9bc7201568f1c1f6f0a0c425cff6229ffc597.tar.lz yuzu-0bd9bc7201568f1c1f6f0a0c425cff6229ffc597.tar.xz yuzu-0bd9bc7201568f1c1f6f0a0c425cff6229ffc597.tar.zst yuzu-0bd9bc7201568f1c1f6f0a0c425cff6229ffc597.zip |
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_buffer_cache.h')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_buffer_cache.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 65cb3c8ad..9ebbef835 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -23,13 +23,13 @@ class VKDevice; class VKMemoryManager; class VKScheduler; -class CachedBufferBlock final : public VideoCommon::BufferBlock { +class Buffer final : public VideoCommon::BufferBlock { public: - explicit CachedBufferBlock(const VKDevice& device, VKMemoryManager& memory_manager, - VAddr cpu_addr, std::size_t size); - ~CachedBufferBlock(); + explicit Buffer(const VKDevice& device, VKMemoryManager& memory_manager, VAddr cpu_addr, + std::size_t size); + ~Buffer(); - VkBuffer GetHandle() const { + VkBuffer Handle() const { return *buffer.handle; } @@ -37,8 +37,6 @@ private: VKBuffer buffer; }; -using Buffer = std::shared_ptr<CachedBufferBlock>; - class VKBufferCache final : public VideoCommon::BufferCache<Buffer, VkBuffer, VKStreamBuffer> { public: explicit VKBufferCache(VideoCore::RasterizerInterface& rasterizer, Core::System& system, @@ -49,9 +47,7 @@ public: VkBuffer GetEmptyBuffer(std::size_t size) override; protected: - VkBuffer ToHandle(const Buffer& buffer) override; - - Buffer CreateBlock(VAddr cpu_addr, std::size_t size) override; + std::shared_ptr<Buffer> CreateBlock(VAddr cpu_addr, std::size_t size) override; void UploadBlockData(const Buffer& buffer, std::size_t offset, std::size_t size, const u8* data) override; |