The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-06 05:35:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for split mappings to I2M uploads

Browse Source 
Used by Super Mario Sunshine and other Vulkan games.
This commit is contained in:
Billy Laws 2022-10-30 16:21:13 +00:00
parent db5e208379
commit b04d18eba5
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/cpp/skyline/gpu/interconnect/inline2memory.cpp
View File

@ -15,24 +15,19 @@ namespace skyline::gpu::interconnect {
channelCtx{channelCtx}, channelCtx{channelCtx},
executor{channelCtx.executor} {} executor{channelCtx.executor} {}
void Inline2Memory::Upload(IOVA dst, span<u32> src) { void Inline2Memory::UploadSingleMapping(span<u8> dst, span<u8> src) {
auto dstMappings{channelCtx.asCtx->gmmu.TranslateRange(dst, src.size_bytes())}; auto dstBuf{gpu.buffer.FindOrCreate(dst, executor.tag, [this](std::shared_ptr<Buffer> buffer, ContextLock<Buffer> &&lock) {
if (dstMappings.size() > 1)
Logger::Warn("Split mapping are unsupported for DMA copies");
auto dstBuf{gpu.buffer.FindOrCreate(dstMappings.front(), executor.tag, [this](std::shared_ptr<Buffer> buffer, ContextLock<Buffer> &&lock) {
executor.AttachLockedBuffer(buffer, std::move(lock)); executor.AttachLockedBuffer(buffer, std::move(lock));
})}; })};
ContextLock dstBufLock{executor.tag, dstBuf}; ContextLock dstBufLock{executor.tag, dstBuf};
dstBuf.Write(src.cast<u8>(), 0, [&]() { dstBuf.Write(src, 0, [&]() {
executor.AttachLockedBufferView(dstBuf, std::move(dstBufLock)); executor.AttachLockedBufferView(dstBuf, std::move(dstBufLock));
// This will prevent any CPU accesses to backing for the duration of the usage // This will prevent any CPU accesses to backing for the duration of the usage
dstBuf.GetBuffer()->BlockAllCpuBackingWrites(); dstBuf.GetBuffer()->BlockAllCpuBackingWrites();
auto srcGpuAllocation{gpu.megaBufferAllocator.Push(executor.cycle, src.cast<u8>())}; auto srcGpuAllocation{gpu.megaBufferAllocator.Push(executor.cycle, src)};
executor.AddOutsideRpCommand([srcGpuAllocation, dstBuf, src](vk::raii::CommandBuffer &commandBuffer, const std::shared_ptr<FenceCycle> &, GPU &) { executor.AddOutsideRpCommand([srcGpuAllocation, dstBuf, src](vk::raii::CommandBuffer &commandBuffer, const std::shared_ptr<FenceCycle> &, GPU &) {
vk::BufferCopy copyRegion{ vk::BufferCopy copyRegion{
.size = src.size_bytes(), .size = src.size_bytes(),
@ -47,4 +42,14 @@ namespace skyline::gpu::interconnect {
}); });
}); });
} }
void Inline2Memory::Upload(IOVA dst, span<u32> src) {
auto dstMappings{channelCtx.asCtx->gmmu.TranslateRange(dst, src.size_bytes())};
size_t offset{};
for (auto mapping : dstMappings) {
UploadSingleMapping(mapping, src.cast<u8>().subspan(offset, mapping.size()));
offset += mapping.size();
}
}
} }

2
app/src/main/cpp/skyline/gpu/interconnect/inline2memory.h
View File

@ -28,6 +28,8 @@ namespace skyline::gpu::interconnect {
soc::gm20b::ChannelContext &channelCtx; soc::gm20b::ChannelContext &channelCtx;
gpu::interconnect::CommandExecutor &executor; gpu::interconnect::CommandExecutor &executor;
void UploadSingleMapping(span<u8> dst, span<u8> src);
public: public:
Inline2Memory(GPU &gpu, soc::gm20b::ChannelContext &channelCtx); Inline2Memory(GPU &gpu, soc::gm20b::ChannelContext &channelCtx);