yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #12261 from liamwhite/fruit-company 

texture_cache: use pedantic type names
This commit is contained in:
liamwhite 2023-12-02 09:28:43 -05:00 committed by GitHub
parent 0ed292568f 345ea568ba
commit 69529a748c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View File

@ -1439,7 +1439,7 @@ void Image::UploadMemory(const StagingBufferRef& map, std::span<const BufferImag
UploadMemory(map.buffer, map.offset, copies); 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::span<const VideoCommon::BufferImageCopy> copies) {
std::array buffer_handles{ std::array buffer_handles{
buffer, buffer,
@ -1450,7 +1450,7 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset,
DownloadMemory(buffer_handles, buffer_offsets, copies); 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) { std::span<const VideoCommon::BufferImageCopy> copies) {
const bool is_rescaled = True(flags & ImageFlagBits::Rescaled); const bool is_rescaled = True(flags & ImageFlagBits::Rescaled);
if (is_rescaled) { if (is_rescaled) {
@ -1530,7 +1530,7 @@ void Image::DownloadMemory(const StagingBufferRef& map, std::span<const BufferIm
map.buffer, map.buffer,
}; };
std::array offsets{ std::array offsets{
map.offset, static_cast<size_t>(map.offset),
}; };
DownloadMemory(buffers, offsets, copies); DownloadMemory(buffers, offsets, copies);
} }

4
src/video_core/renderer_vulkan/vk_texture_cache.h
View File

@ -147,10 +147,10 @@ public:
void UploadMemory(const StagingBufferRef& map, void UploadMemory(const StagingBufferRef& map,
std::span<const VideoCommon::BufferImageCopy> copies); 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); 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); std::span<const VideoCommon::BufferImageCopy> copies);
void DownloadMemory(const StagingBufferRef& map, void DownloadMemory(const StagingBufferRef& map,

2
src/video_core/texture_cache/texture_cache.h
View File

@ -995,7 +995,7 @@ void TextureCache<P>::DownloadImageIntoBuffer(typename TextureCache<P>::Image* i
buffer, buffer,
download_map.buffer, download_map.buffer,
}; };
std::array<u64, 2> buffer_offsets{ std::array<size_t, 2> buffer_offsets{
buffer_offset, buffer_offset,
download_map.offset, download_map.offset,
}; };