diff options
Diffstat (limited to 'src')
| -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 | |||
| 1439 | UploadMemory(map.buffer, map.offset, copies); | 1439 | UploadMemory(map.buffer, map.offset, copies); |
| 1440 | } | 1440 | } |
| 1441 | 1441 | ||
| 1442 | void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, | 1442 | void Image::DownloadMemory(VkBuffer buffer, size_t offset, |
| 1443 | std::span<const VideoCommon::BufferImageCopy> copies) { | 1443 | std::span<const VideoCommon::BufferImageCopy> copies) { |
| 1444 | std::array buffer_handles{ | 1444 | std::array buffer_handles{ |
| 1445 | buffer, | 1445 | buffer, |
| @@ -1450,7 +1450,7 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset, | |||
| 1450 | DownloadMemory(buffer_handles, buffer_offsets, copies); | 1450 | DownloadMemory(buffer_handles, buffer_offsets, copies); |
| 1451 | } | 1451 | } |
| 1452 | 1452 | ||
| 1453 | void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<VkDeviceSize> offsets_span, | 1453 | void Image::DownloadMemory(std::span<VkBuffer> buffers_span, std::span<size_t> offsets_span, |
| 1454 | std::span<const VideoCommon::BufferImageCopy> copies) { | 1454 | std::span<const VideoCommon::BufferImageCopy> copies) { |
| 1455 | const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); | 1455 | const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); |
| 1456 | if (is_rescaled) { | 1456 | if (is_rescaled) { |
| @@ -1530,7 +1530,7 @@ void Image::DownloadMemory(const StagingBufferRef& map, std::span<const BufferIm | |||
| 1530 | map.buffer, | 1530 | map.buffer, |
| 1531 | }; | 1531 | }; |
| 1532 | std::array offsets{ | 1532 | std::array offsets{ |
| 1533 | map.offset, | 1533 | static_cast<size_t>(map.offset), |
| 1534 | }; | 1534 | }; |
| 1535 | DownloadMemory(buffers, offsets, copies); | 1535 | DownloadMemory(buffers, offsets, copies); |
| 1536 | } | 1536 | } |
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: | |||
| 147 | void UploadMemory(const StagingBufferRef& map, | 147 | void UploadMemory(const StagingBufferRef& map, |
| 148 | std::span<const VideoCommon::BufferImageCopy> copies); | 148 | std::span<const VideoCommon::BufferImageCopy> copies); |
| 149 | 149 | ||
| 150 | void DownloadMemory(VkBuffer buffer, VkDeviceSize offset, | 150 | void DownloadMemory(VkBuffer buffer, size_t offset, |
| 151 | std::span<const VideoCommon::BufferImageCopy> copies); | 151 | std::span<const VideoCommon::BufferImageCopy> copies); |
| 152 | 152 | ||
| 153 | void DownloadMemory(std::span<VkBuffer> buffers, std::span<VkDeviceSize> offsets, | 153 | void DownloadMemory(std::span<VkBuffer> buffers, std::span<size_t> offsets, |
| 154 | std::span<const VideoCommon::BufferImageCopy> copies); | 154 | std::span<const VideoCommon::BufferImageCopy> copies); |
| 155 | 155 | ||
| 156 | void DownloadMemory(const StagingBufferRef& map, | 156 | 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 | |||
| 995 | buffer, | 995 | buffer, |
| 996 | download_map.buffer, | 996 | download_map.buffer, |
| 997 | }; | 997 | }; |
| 998 | std::array<u64, 2> buffer_offsets{ | 998 | std::array<size_t, 2> buffer_offsets{ |
| 999 | buffer_offset, | 999 | buffer_offset, |
| 1000 | download_map.offset, | 1000 | download_map.offset, |
| 1001 | }; | 1001 | }; |