mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 14:23:22 +02:00
TextureCache: refactor DMA downloads to allow multiple buffers.
This commit is contained in:
parent
9bf19b04f6
commit
3fbee093b2
@ -1299,7 +1299,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info,
|
|||||||
if constexpr (IS_IMAGE_UPLOAD) {
|
if constexpr (IS_IMAGE_UPLOAD) {
|
||||||
image->UploadMemory(buffer->Handle(), offset, copy_span);
|
image->UploadMemory(buffer->Handle(), offset, copy_span);
|
||||||
} else {
|
} else {
|
||||||
image->DownloadMemory(buffer->Handle(), offset, copy_span);
|
texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -801,32 +801,34 @@ void Image::UploadMemory(const ImageBufferMap& map,
|
|||||||
UploadMemory(map.buffer, map.offset, copies);
|
UploadMemory(map.buffer, map.offset, copies);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Image::DownloadMemory(GLuint buffer_handle, size_t buffer_offset,
|
void Image::DownloadMemory(std::span<GLuint> buffer_handles, size_t buffer_offset,
|
||||||
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) {
|
||||||
ScaleDown();
|
ScaleDown();
|
||||||
}
|
}
|
||||||
glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT); // TODO: Move this to its own API
|
glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT); // TODO: Move this to its own API
|
||||||
glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer_handle);
|
for (auto buffer_handle : buffer_handles) {
|
||||||
glPixelStorei(GL_PACK_ALIGNMENT, 1);
|
glBindBuffer(GL_PIXEL_PACK_BUFFER, buffer_handle);
|
||||||
|
glPixelStorei(GL_PACK_ALIGNMENT, 1);
|
||||||
|
|
||||||
u32 current_row_length = std::numeric_limits<u32>::max();
|
u32 current_row_length = std::numeric_limits<u32>::max();
|
||||||
u32 current_image_height = std::numeric_limits<u32>::max();
|
u32 current_image_height = std::numeric_limits<u32>::max();
|
||||||
|
|
||||||
for (const VideoCommon::BufferImageCopy& copy : copies) {
|
for (const VideoCommon::BufferImageCopy& copy : copies) {
|
||||||
if (copy.image_subresource.base_level >= gl_num_levels) {
|
if (copy.image_subresource.base_level >= gl_num_levels) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
if (current_row_length != copy.buffer_row_length) {
|
||||||
|
current_row_length = copy.buffer_row_length;
|
||||||
|
glPixelStorei(GL_PACK_ROW_LENGTH, current_row_length);
|
||||||
|
}
|
||||||
|
if (current_image_height != copy.buffer_image_height) {
|
||||||
|
current_image_height = copy.buffer_image_height;
|
||||||
|
glPixelStorei(GL_PACK_IMAGE_HEIGHT, current_image_height);
|
||||||
|
}
|
||||||
|
CopyImageToBuffer(copy, buffer_offset);
|
||||||
}
|
}
|
||||||
if (current_row_length != copy.buffer_row_length) {
|
|
||||||
current_row_length = copy.buffer_row_length;
|
|
||||||
glPixelStorei(GL_PACK_ROW_LENGTH, current_row_length);
|
|
||||||
}
|
|
||||||
if (current_image_height != copy.buffer_image_height) {
|
|
||||||
current_image_height = copy.buffer_image_height;
|
|
||||||
glPixelStorei(GL_PACK_IMAGE_HEIGHT, current_image_height);
|
|
||||||
}
|
|
||||||
CopyImageToBuffer(copy, buffer_offset);
|
|
||||||
}
|
}
|
||||||
if (is_rescaled) {
|
if (is_rescaled) {
|
||||||
ScaleUp(true);
|
ScaleUp(true);
|
||||||
@ -835,7 +837,10 @@ void Image::DownloadMemory(GLuint buffer_handle, size_t buffer_offset,
|
|||||||
|
|
||||||
void Image::DownloadMemory(ImageBufferMap& map,
|
void Image::DownloadMemory(ImageBufferMap& map,
|
||||||
std::span<const VideoCommon::BufferImageCopy> copies) {
|
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
DownloadMemory(map.buffer, map.offset, copies);
|
std::array buffers{
|
||||||
|
map.buffer,
|
||||||
|
};
|
||||||
|
DownloadMemory(buffers, map.offset, copies);
|
||||||
}
|
}
|
||||||
|
|
||||||
GLuint Image::StorageHandle() noexcept {
|
GLuint Image::StorageHandle() noexcept {
|
||||||
|
@ -212,7 +212,7 @@ public:
|
|||||||
void UploadMemory(const ImageBufferMap& map,
|
void UploadMemory(const ImageBufferMap& map,
|
||||||
std::span<const VideoCommon::BufferImageCopy> copies);
|
std::span<const VideoCommon::BufferImageCopy> copies);
|
||||||
|
|
||||||
void DownloadMemory(GLuint buffer_handle, size_t buffer_offset,
|
void DownloadMemory(std::span<GLuint> buffer_handle, size_t buffer_offset,
|
||||||
std::span<const VideoCommon::BufferImageCopy> copies);
|
std::span<const VideoCommon::BufferImageCopy> copies);
|
||||||
|
|
||||||
void DownloadMemory(ImageBufferMap& map, std::span<const VideoCommon::BufferImageCopy> copies);
|
void DownloadMemory(ImageBufferMap& map, std::span<const VideoCommon::BufferImageCopy> copies);
|
||||||
@ -376,6 +376,7 @@ struct TextureCacheParams {
|
|||||||
using Sampler = OpenGL::Sampler;
|
using Sampler = OpenGL::Sampler;
|
||||||
using Framebuffer = OpenGL::Framebuffer;
|
using Framebuffer = OpenGL::Framebuffer;
|
||||||
using AsyncBuffer = u32;
|
using AsyncBuffer = u32;
|
||||||
|
using BufferType = GLuint;
|
||||||
};
|
};
|
||||||
|
|
||||||
using TextureCache = VideoCommon::TextureCache<TextureCacheParams>;
|
using TextureCache = VideoCommon::TextureCache<TextureCacheParams>;
|
||||||
|
@ -793,7 +793,7 @@ bool AccelerateDMA::DmaBufferImageCopy(const Tegra::DMA::ImageCopy& copy_info,
|
|||||||
if constexpr (IS_IMAGE_UPLOAD) {
|
if constexpr (IS_IMAGE_UPLOAD) {
|
||||||
image->UploadMemory(buffer->Handle(), offset, copy_span);
|
image->UploadMemory(buffer->Handle(), offset, copy_span);
|
||||||
} else {
|
} else {
|
||||||
image->DownloadMemory(buffer->Handle(), offset, copy_span);
|
texture_cache.DownloadImageIntoBuffer(image, buffer->Handle(), offset, copy_span);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <span>
|
#include <span>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <boost/container/small_vector.hpp>
|
||||||
|
|
||||||
#include "common/bit_cast.h"
|
#include "common/bit_cast.h"
|
||||||
#include "common/bit_util.h"
|
#include "common/bit_util.h"
|
||||||
@ -1341,16 +1342,20 @@ 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(std::span<VkBuffer> buffers_span, VkDeviceSize offset,
|
||||||
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) {
|
||||||
ScaleDown();
|
ScaleDown();
|
||||||
}
|
}
|
||||||
|
boost::container::small_vector<VkBuffer, 1> buffers_vector{};
|
||||||
|
for (auto& buffer : buffers_span) {
|
||||||
|
buffers_vector.push_back(buffer);
|
||||||
|
}
|
||||||
std::vector vk_copies = TransformBufferImageCopies(copies, offset, aspect_mask);
|
std::vector vk_copies = TransformBufferImageCopies(copies, offset, aspect_mask);
|
||||||
scheduler->RequestOutsideRenderPassOperationContext();
|
scheduler->RequestOutsideRenderPassOperationContext();
|
||||||
scheduler->Record([buffer, image = *original_image, aspect_mask = aspect_mask,
|
scheduler->Record([buffers = std::move(buffers_vector), image = *original_image,
|
||||||
vk_copies](vk::CommandBuffer cmdbuf) {
|
aspect_mask = aspect_mask, vk_copies](vk::CommandBuffer cmdbuf) {
|
||||||
const VkImageMemoryBarrier read_barrier{
|
const VkImageMemoryBarrier read_barrier{
|
||||||
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
||||||
.pNext = nullptr,
|
.pNext = nullptr,
|
||||||
@ -1369,6 +1374,20 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset,
|
|||||||
.layerCount = VK_REMAINING_ARRAY_LAYERS,
|
.layerCount = VK_REMAINING_ARRAY_LAYERS,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
|
||||||
|
0, read_barrier);
|
||||||
|
|
||||||
|
for (auto buffer : buffers) {
|
||||||
|
cmdbuf.CopyImageToBuffer(image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer,
|
||||||
|
vk_copies);
|
||||||
|
}
|
||||||
|
|
||||||
|
const VkMemoryBarrier memory_write_barrier{
|
||||||
|
.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,
|
||||||
|
.pNext = nullptr,
|
||||||
|
.srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,
|
||||||
|
.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
|
||||||
|
};
|
||||||
const VkImageMemoryBarrier image_write_barrier{
|
const VkImageMemoryBarrier image_write_barrier{
|
||||||
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
||||||
.pNext = nullptr,
|
.pNext = nullptr,
|
||||||
@ -1387,15 +1406,6 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset,
|
|||||||
.layerCount = VK_REMAINING_ARRAY_LAYERS,
|
.layerCount = VK_REMAINING_ARRAY_LAYERS,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
const VkMemoryBarrier memory_write_barrier{
|
|
||||||
.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,
|
|
||||||
.pNext = nullptr,
|
|
||||||
.srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,
|
|
||||||
.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
|
|
||||||
};
|
|
||||||
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
|
|
||||||
0, read_barrier);
|
|
||||||
cmdbuf.CopyImageToBuffer(image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer, vk_copies);
|
|
||||||
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
||||||
0, memory_write_barrier, nullptr, image_write_barrier);
|
0, memory_write_barrier, nullptr, image_write_barrier);
|
||||||
});
|
});
|
||||||
@ -1405,7 +1415,10 @@ void Image::DownloadMemory(VkBuffer buffer, VkDeviceSize offset,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Image::DownloadMemory(const StagingBufferRef& map, std::span<const BufferImageCopy> copies) {
|
void Image::DownloadMemory(const StagingBufferRef& map, std::span<const BufferImageCopy> copies) {
|
||||||
DownloadMemory(map.buffer, map.offset, copies);
|
std::array buffers{
|
||||||
|
map.buffer,
|
||||||
|
};
|
||||||
|
DownloadMemory(buffers, map.offset, copies);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Image::IsRescaled() const noexcept {
|
bool Image::IsRescaled() const noexcept {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
@ -138,7 +138,7 @@ 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(std::span<VkBuffer> buffers, VkDeviceSize offset,
|
||||||
std::span<const VideoCommon::BufferImageCopy> copies);
|
std::span<const VideoCommon::BufferImageCopy> copies);
|
||||||
|
|
||||||
void DownloadMemory(const StagingBufferRef& map,
|
void DownloadMemory(const StagingBufferRef& map,
|
||||||
@ -371,6 +371,7 @@ struct TextureCacheParams {
|
|||||||
using Sampler = Vulkan::Sampler;
|
using Sampler = Vulkan::Sampler;
|
||||||
using Framebuffer = Vulkan::Framebuffer;
|
using Framebuffer = Vulkan::Framebuffer;
|
||||||
using AsyncBuffer = Vulkan::StagingBufferRef;
|
using AsyncBuffer = Vulkan::StagingBufferRef;
|
||||||
|
using BufferType = VkBuffer;
|
||||||
};
|
};
|
||||||
|
|
||||||
using TextureCache = VideoCommon::TextureCache<TextureCacheParams>;
|
using TextureCache = VideoCommon::TextureCache<TextureCacheParams>;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
|
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
@ -833,6 +833,16 @@ std::pair<typename TextureCache<P>::Image*, BufferImageCopy> TextureCache<P>::Dm
|
|||||||
return {image, copy};
|
return {image, copy};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <class P>
|
||||||
|
void TextureCache<P>::DownloadImageIntoBuffer(
|
||||||
|
typename TextureCache<P>::Image* image, typename TextureCache<P>::BufferType buffer,
|
||||||
|
size_t buffer_offset, std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
|
std::array buffers{
|
||||||
|
buffer,
|
||||||
|
};
|
||||||
|
image->DownloadMemory(buffers, buffer_offset, copies);
|
||||||
|
}
|
||||||
|
|
||||||
template <class P>
|
template <class P>
|
||||||
void TextureCache<P>::RefreshContents(Image& image, ImageId image_id) {
|
void TextureCache<P>::RefreshContents(Image& image, ImageId image_id) {
|
||||||
if (False(image.flags & ImageFlagBits::CpuModified)) {
|
if (False(image.flags & ImageFlagBits::CpuModified)) {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
|
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
@ -119,6 +119,7 @@ class TextureCache : public VideoCommon::ChannelSetupCaches<TextureCacheChannelI
|
|||||||
using Sampler = typename P::Sampler;
|
using Sampler = typename P::Sampler;
|
||||||
using Framebuffer = typename P::Framebuffer;
|
using Framebuffer = typename P::Framebuffer;
|
||||||
using AsyncBuffer = typename P::AsyncBuffer;
|
using AsyncBuffer = typename P::AsyncBuffer;
|
||||||
|
using BufferType = typename P::BufferType;
|
||||||
|
|
||||||
struct BlitImages {
|
struct BlitImages {
|
||||||
ImageId dst_id;
|
ImageId dst_id;
|
||||||
@ -215,6 +216,9 @@ public:
|
|||||||
const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& buffer_operand,
|
const Tegra::DMA::ImageCopy& copy_info, const Tegra::DMA::BufferOperand& buffer_operand,
|
||||||
const Tegra::DMA::ImageOperand& image_operand, ImageId image_id, bool modifies_image);
|
const Tegra::DMA::ImageOperand& image_operand, ImageId image_id, bool modifies_image);
|
||||||
|
|
||||||
|
void DownloadImageIntoBuffer(Image* image, BufferType buffer, size_t buffer_offset,
|
||||||
|
std::span<const VideoCommon::BufferImageCopy> copies);
|
||||||
|
|
||||||
/// Return true when a CPU region is modified from the GPU
|
/// Return true when a CPU region is modified from the GPU
|
||||||
[[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size);
|
[[nodiscard]] bool IsRegionGpuModified(VAddr addr, size_t size);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user