diff options
author | ameerj <52414509+ameerj@users.noreply.github.com> | 2022-12-22 23:01:39 +0100 |
---|---|---|
committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2022-12-25 21:38:36 +0100 |
commit | 1209d428f14ffc6f1c8b6049b0431c30b26138d6 (patch) | |
tree | f1fe11edaaf1230d26e6c42e97b6eb51485973a3 /src/video_core/texture_cache/util.cpp | |
parent | texture_cache: Use pre-allocated buffer for texture uploads (diff) | |
download | yuzu-1209d428f14ffc6f1c8b6049b0431c30b26138d6.tar yuzu-1209d428f14ffc6f1c8b6049b0431c30b26138d6.tar.gz yuzu-1209d428f14ffc6f1c8b6049b0431c30b26138d6.tar.bz2 yuzu-1209d428f14ffc6f1c8b6049b0431c30b26138d6.tar.lz yuzu-1209d428f14ffc6f1c8b6049b0431c30b26138d6.tar.xz yuzu-1209d428f14ffc6f1c8b6049b0431c30b26138d6.tar.zst yuzu-1209d428f14ffc6f1c8b6049b0431c30b26138d6.zip |
Diffstat (limited to 'src/video_core/texture_cache/util.cpp')
-rw-r--r-- | src/video_core/texture_cache/util.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 4488fa9da..7999a7f06 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp @@ -505,7 +505,7 @@ void SwizzlePitchLinearImage(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr void SwizzleBlockLinearImage(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr, const ImageInfo& info, const BufferImageCopy& copy, - std::span<const u8> input) { + std::span<const u8> input, std::vector<u8>& tmp_buffer) { const Extent3D size = info.size; const LevelInfo level_info = MakeLevelInfo(info); const Extent2D tile_size = DefaultBlockSize(info.format); @@ -534,8 +534,8 @@ void SwizzleBlockLinearImage(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr tile_size.height, info.tile_width_spacing); const size_t subresource_size = sizes[level]; - const auto dst_data = std::make_unique<u8[]>(subresource_size); - const std::span<u8> dst(dst_data.get(), subresource_size); + tmp_buffer.resize(subresource_size); + const std::span<u8> dst(tmp_buffer); for (s32 layer = 0; layer < info.resources.layers; ++layer) { const std::span<const u8> src = input.subspan(host_offset); @@ -977,13 +977,14 @@ std::vector<SwizzleParameters> FullUploadSwizzles(const ImageInfo& info) { } void SwizzleImage(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr, const ImageInfo& info, - std::span<const BufferImageCopy> copies, std::span<const u8> memory) { + std::span<const BufferImageCopy> copies, std::span<const u8> memory, + std::vector<u8>& tmp_buffer) { const bool is_pitch_linear = info.type == ImageType::Linear; for (const BufferImageCopy& copy : copies) { if (is_pitch_linear) { SwizzlePitchLinearImage(gpu_memory, gpu_addr, info, copy, memory); } else { - SwizzleBlockLinearImage(gpu_memory, gpu_addr, info, copy, memory); + SwizzleBlockLinearImage(gpu_memory, gpu_addr, info, copy, memory, tmp_buffer); } } } |