VERY experimental Nintendo Switch 2 emulator
C++
texture_cache: use pedantic type names
Liam9014e6783f58
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cppindex 5dbec2e62e..38b1619df9 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 BufferImagUploadMemory(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 BufferImmap.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.hindex edf5d76357..0dbde65d6b 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.hindex d575c57ca5..dade38b18c 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* ibuffer,download_map.buffer,};- std::array<u64, 2> buffer_offsets{+ std::array<size_t, 2> buffer_offsets{buffer_offset,download_map.offset,};