diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-02 15:28:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-02 15:28:43 +0100 |
| commit | 69529a748c7ca5c92d13c3a29fa8c3eb6148ae56 (patch) | |
| tree | 73c9f1923dfa17fa8f25ba0aa90aab4c88b64be4 /src/video_core/renderer_vulkan | |
| parent | Merge pull request #12260 from t895/install-reload-fix (diff) | |
| parent | texture_cache: use pedantic type names (diff) | |
| download | yuzu-69529a748c7ca5c92d13c3a29fa8c3eb6148ae56.tar yuzu-69529a748c7ca5c92d13c3a29fa8c3eb6148ae56.tar.gz yuzu-69529a748c7ca5c92d13c3a29fa8c3eb6148ae56.tar.bz2 yuzu-69529a748c7ca5c92d13c3a29fa8c3eb6148ae56.tar.lz yuzu-69529a748c7ca5c92d13c3a29fa8c3eb6148ae56.tar.xz yuzu-69529a748c7ca5c92d13c3a29fa8c3eb6148ae56.tar.zst yuzu-69529a748c7ca5c92d13c3a29fa8c3eb6148ae56.zip | |
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -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 |
2 files changed, 5 insertions, 5 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, |