mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-07-23 10:35:03 +00:00
clang format
This commit is contained in:
parent
c0e6c42d94
commit
6534008e70
@ -882,8 +882,7 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (dma_data->src_sel == DmaDataSrc::Data && dma_data->dst_sel == DmaDataDst::Gds) {
|
if (dma_data->src_sel == DmaDataSrc::Data && dma_data->dst_sel == DmaDataDst::Gds) {
|
||||||
rasterizer->InlineData(dma_data->dst_addr_lo, &dma_data->data, sizeof(u32),
|
rasterizer->InlineData(dma_data->dst_addr_lo, &dma_data->data, sizeof(u32), true);
|
||||||
true);
|
|
||||||
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
|
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
|
||||||
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
|
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
|
||||||
dma_data->dst_sel == DmaDataDst::Gds) {
|
dma_data->dst_sel == DmaDataDst::Gds) {
|
||||||
@ -892,8 +891,8 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
|
|||||||
} else if (dma_data->src_sel == DmaDataSrc::Data &&
|
} else if (dma_data->src_sel == DmaDataSrc::Data &&
|
||||||
(dma_data->dst_sel == DmaDataDst::Memory ||
|
(dma_data->dst_sel == DmaDataDst::Memory ||
|
||||||
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
|
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
|
||||||
rasterizer->InlineData(dma_data->DstAddress<VAddr>(), &dma_data->data,
|
rasterizer->InlineData(dma_data->DstAddress<VAddr>(), &dma_data->data, sizeof(u32),
|
||||||
sizeof(u32), false);
|
false);
|
||||||
} else if (dma_data->src_sel == DmaDataSrc::Gds &&
|
} else if (dma_data->src_sel == DmaDataSrc::Gds &&
|
||||||
(dma_data->dst_sel == DmaDataDst::Memory ||
|
(dma_data->dst_sel == DmaDataDst::Memory ||
|
||||||
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
|
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
|
||||||
@ -903,9 +902,8 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
|
|||||||
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
|
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
|
||||||
(dma_data->dst_sel == DmaDataDst::Memory ||
|
(dma_data->dst_sel == DmaDataDst::Memory ||
|
||||||
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
|
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
|
||||||
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(),
|
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(), dma_data->SrcAddress<VAddr>(),
|
||||||
dma_data->SrcAddress<VAddr>(), dma_data->NumBytes(),
|
dma_data->NumBytes(), false, false);
|
||||||
false, false);
|
|
||||||
} else {
|
} else {
|
||||||
UNREACHABLE_MSG("WriteData src_sel = {}, dst_sel = {}",
|
UNREACHABLE_MSG("WriteData src_sel = {}, dst_sel = {}",
|
||||||
u32(dma_data->src_sel.Value()), u32(dma_data->dst_sel.Value()));
|
u32(dma_data->src_sel.Value()), u32(dma_data->dst_sel.Value()));
|
||||||
|
@ -30,7 +30,8 @@ static constexpr size_t MaxPageFaults = 1024;
|
|||||||
static constexpr size_t DownloadSizeThreshold = 2_MB;
|
static constexpr size_t DownloadSizeThreshold = 2_MB;
|
||||||
|
|
||||||
BufferCache::BufferCache(const Vulkan::Instance& instance_, Vulkan::Scheduler& scheduler_,
|
BufferCache::BufferCache(const Vulkan::Instance& instance_, Vulkan::Scheduler& scheduler_,
|
||||||
AmdGpu::Liverpool* liverpool_, TextureCache& texture_cache_, PageManager& tracker_)
|
AmdGpu::Liverpool* liverpool_, TextureCache& texture_cache_,
|
||||||
|
PageManager& tracker_)
|
||||||
: instance{instance_}, scheduler{scheduler_}, liverpool{liverpool_},
|
: instance{instance_}, scheduler{scheduler_}, liverpool{liverpool_},
|
||||||
memory{Core::Memory::Instance()}, texture_cache{texture_cache_}, tracker{tracker_},
|
memory{Core::Memory::Instance()}, texture_cache{texture_cache_}, tracker{tracker_},
|
||||||
staging_buffer{instance, scheduler, MemoryUsage::Upload, StagingBufferSize},
|
staging_buffer{instance, scheduler, MemoryUsage::Upload, StagingBufferSize},
|
||||||
@ -182,8 +183,8 @@ void BufferCache::DownloadBufferMemory(const Buffer& buffer, VAddr device_addr,
|
|||||||
for (const auto& copy : copies) {
|
for (const auto& copy : copies) {
|
||||||
const VAddr copy_device_addr = buffer.CpuAddr() + copy.srcOffset;
|
const VAddr copy_device_addr = buffer.CpuAddr() + copy.srcOffset;
|
||||||
const u64 dst_offset = copy.dstOffset - offset;
|
const u64 dst_offset = copy.dstOffset - offset;
|
||||||
ASSERT(memory->TryWriteBacking(std::bit_cast<u8*>(copy_device_addr),
|
ASSERT(memory->TryWriteBacking(std::bit_cast<u8*>(copy_device_addr), download + dst_offset,
|
||||||
download + dst_offset, copy.size));
|
copy.size));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -400,7 +401,8 @@ void BufferCache::CopyBuffer(VAddr dst, VAddr src, u32 num_bytes, bool dst_gds,
|
|||||||
return;
|
return;
|
||||||
} else if (!dst_gds) {
|
} else if (!dst_gds) {
|
||||||
// Write to backing memory to bypass memory protection.
|
// Write to backing memory to bypass memory protection.
|
||||||
ASSERT(memory->TryWriteBacking(std::bit_cast<void*>(dst), std::bit_cast<void*>(src), num_bytes));
|
ASSERT(memory->TryWriteBacking(std::bit_cast<void*>(dst), std::bit_cast<void*>(src),
|
||||||
|
num_bytes));
|
||||||
}
|
}
|
||||||
// Without a readback there's nothing we can do with this
|
// Without a readback there's nothing we can do with this
|
||||||
// Fallback to creating dst buffer on GPU to at least have this data there
|
// Fallback to creating dst buffer on GPU to at least have this data there
|
||||||
|
@ -71,7 +71,8 @@ public:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit BufferCache(const Vulkan::Instance& instance, Vulkan::Scheduler& scheduler,
|
explicit BufferCache(const Vulkan::Instance& instance, Vulkan::Scheduler& scheduler,
|
||||||
AmdGpu::Liverpool* liverpool, TextureCache& texture_cache, PageManager& tracker);
|
AmdGpu::Liverpool* liverpool, TextureCache& texture_cache,
|
||||||
|
PageManager& tracker);
|
||||||
~BufferCache();
|
~BufferCache();
|
||||||
|
|
||||||
/// Returns a pointer to GDS device local buffer.
|
/// Returns a pointer to GDS device local buffer.
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
#include <boost/container/small_vector.hpp>
|
#include <boost/container/small_vector.hpp>
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/div_ceil.h"
|
|
||||||
#include "common/debug.h"
|
#include "common/debug.h"
|
||||||
|
#include "common/div_ceil.h"
|
||||||
#include "common/signal_context.h"
|
#include "common/signal_context.h"
|
||||||
#include "core/memory.h"
|
#include "core/memory.h"
|
||||||
#include "core/signals.h"
|
#include "core/signals.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user