summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_vulkan/vk_buffer_cache.h
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-04-13 22:08:04 +0200
committerGitHub <noreply@github.com>2020-04-13 22:08:04 +0200
commit7e4a132a77fd1c2d48b1410ac1f1da81869daa90 (patch)
tree79f2f04b5d7233eb3b57f86af3281f6ef5f30282 /src/video_core/renderer_vulkan/vk_buffer_cache.h
parentMerge pull request #3651 from ReinUsesLisp/line-widths (diff)
parentrenderer_vulkan: Drop Vulkan-Hpp (diff)
downloadyuzu-7e4a132a77fd1c2d48b1410ac1f1da81869daa90.tar
yuzu-7e4a132a77fd1c2d48b1410ac1f1da81869daa90.tar.gz
yuzu-7e4a132a77fd1c2d48b1410ac1f1da81869daa90.tar.bz2
yuzu-7e4a132a77fd1c2d48b1410ac1f1da81869daa90.tar.lz
yuzu-7e4a132a77fd1c2d48b1410ac1f1da81869daa90.tar.xz
yuzu-7e4a132a77fd1c2d48b1410ac1f1da81869daa90.tar.zst
yuzu-7e4a132a77fd1c2d48b1410ac1f1da81869daa90.zip
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_buffer_cache.h')
-rw-r--r--src/video_core/renderer_vulkan/vk_buffer_cache.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h
index 508214618..d3c23da98 100644
--- a/src/video_core/renderer_vulkan/vk_buffer_cache.h
+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h
@@ -11,11 +11,11 @@
#include "common/common_types.h"
#include "video_core/buffer_cache/buffer_cache.h"
#include "video_core/rasterizer_cache.h"
-#include "video_core/renderer_vulkan/declarations.h"
#include "video_core/renderer_vulkan/vk_memory_manager.h"
#include "video_core/renderer_vulkan/vk_resource_manager.h"
#include "video_core/renderer_vulkan/vk_staging_buffer_pool.h"
#include "video_core/renderer_vulkan/vk_stream_buffer.h"
+#include "video_core/renderer_vulkan/wrapper.h"
namespace Core {
class System;
@@ -33,8 +33,8 @@ public:
VAddr cpu_addr, std::size_t size);
~CachedBufferBlock();
- const vk::Buffer* GetHandle() const {
- return &*buffer.handle;
+ const VkBuffer* GetHandle() const {
+ return buffer.handle.address();
}
private:
@@ -43,21 +43,21 @@ private:
using Buffer = std::shared_ptr<CachedBufferBlock>;
-class VKBufferCache final : public VideoCommon::BufferCache<Buffer, vk::Buffer, VKStreamBuffer> {
+class VKBufferCache final : public VideoCommon::BufferCache<Buffer, VkBuffer, VKStreamBuffer> {
public:
explicit VKBufferCache(VideoCore::RasterizerInterface& rasterizer, Core::System& system,
const VKDevice& device, VKMemoryManager& memory_manager,
VKScheduler& scheduler, VKStagingBufferPool& staging_pool);
~VKBufferCache();
- const vk::Buffer* GetEmptyBuffer(std::size_t size) override;
+ const VkBuffer* GetEmptyBuffer(std::size_t size) override;
protected:
void WriteBarrier() override {}
Buffer CreateBlock(VAddr cpu_addr, std::size_t size) override;
- const vk::Buffer* ToHandle(const Buffer& buffer) override;
+ const VkBuffer* ToHandle(const Buffer& buffer) override;
void UploadBlockData(const Buffer& buffer, std::size_t offset, std::size_t size,
const u8* data) override;