diff options
author | Liam <byteslice@airmail.cc> | 2023-12-02 04:46:33 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-12-02 04:46:33 +0100 |
commit | 345ea568ba388b60fcb3644306edf15ceb0c71a6 (patch) | |
tree | 2e4cc6d08da0c81672c2fb6d9fa6e21ac013fa33 /src/video_core | |
parent | Merge pull request #12255 from german77/amiibo (diff) | |
download | yuzu-345ea568ba388b60fcb3644306edf15ceb0c71a6.tar yuzu-345ea568ba388b60fcb3644306edf15ceb0c71a6.tar.gz yuzu-345ea568ba388b60fcb3644306edf15ceb0c71a6.tar.bz2 yuzu-345ea568ba388b60fcb3644306edf15ceb0c71a6.tar.lz yuzu-345ea568ba388b60fcb3644306edf15ceb0c71a6.tar.xz yuzu-345ea568ba388b60fcb3644306edf15ceb0c71a6.tar.zst yuzu-345ea568ba388b60fcb3644306edf15ceb0c71a6.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.cpp | 6 | ||||
-rw-r--r-- | src/video_core/renderer_vulkan/vk_texture_cache.h | 4 | ||||
-rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 5dbec2e62..38b1619df 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1439,7 +1439,7 @@ void Image::UploadMemory(const StagingBufferRef& map, std::span<const BufferImag UploadMemory(map.buffer, map.offset, copies); } -void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, +void Image::DownloadMemory(VkBuffer buffer, size_t offset, std::span<const VideoCommon::BufferImageCopy> copies) { std::array buffer_handles{ buffer, @@ -1450,7 +1450,7 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, DownloadMemory(buffer_handles, buffer_offsets, copies); } -void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<VkDeviceSize> offsets_span, +void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<size_t> offsets_span, std::span<const VideoCommon::BufferImageCopy> copies) { const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); if (is_rescaled) { @@ -1530,7 +1530,7 @@ void Image::DownloadMemory(const StagingBufferRef& map, std::span<const BufferIm map.buffer, }; std::array offsets{ - map.offset, + static_cast<size_t>(map.offset), }; DownloadMemory(buffers, offsets, copies); } diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index edf5d7635..0dbde65d6 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -147,10 +147,10 @@ public: void UploadMemory(const StagingBufferRef& map, std::span<const VideoCommon::BufferImageCopy> copies); - void DownloadMemory(VkBuffer buffer, VkDeviceSize offset, + void DownloadMemory(VkBuffer buffer, size_t offset, std::span<const VideoCommon::BufferImageCopy> copies); - void DownloadMemory(std::span<VkBuffer> buffers, std::span<VkDeviceSize> offsets, + void DownloadMemory(std::span<VkBuffer> buffers, std::span<size_t> offsets, std::span<const VideoCommon::BufferImageCopy> copies); void DownloadMemory(const StagingBufferRef& map, diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index d575c57ca..dade38b18 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -995,7 +995,7 @@ void TextureCache<P>::DownloadImageIntoBuffer(typename TextureCache<P>::Image* i buffer, download_map.buffer, }; - std::array<u64, 2> buffer_offsets{ + std::array<size_t, 2> buffer_offsets{ buffer_offset, download_map.offset, }; |