diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-06-09 23:27:59 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-06-09 23:30:49 +0200 |
commit | 6508cdd00351e51c7d5867c00da60781c133ade8 (patch) | |
tree | 4d86ffb3c43a37418235df2d980252bc9b3660b3 /src/video_core/renderer_vulkan/vk_buffer_cache.h | |
parent | Merge pull request #4040 from ReinUsesLisp/nv-transform-feedback (diff) | |
download | yuzu-6508cdd00351e51c7d5867c00da60781c133ade8.tar yuzu-6508cdd00351e51c7d5867c00da60781c133ade8.tar.gz yuzu-6508cdd00351e51c7d5867c00da60781c133ade8.tar.bz2 yuzu-6508cdd00351e51c7d5867c00da60781c133ade8.tar.lz yuzu-6508cdd00351e51c7d5867c00da60781c133ade8.tar.xz yuzu-6508cdd00351e51c7d5867c00da60781c133ade8.tar.zst yuzu-6508cdd00351e51c7d5867c00da60781c133ade8.zip |
Diffstat (limited to '')
-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 a54583e7d..cb9734c10 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -24,13 +24,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; } @@ -38,8 +38,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, @@ -50,9 +48,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; |