Skip to content

Commit c4e747f

Browse files
XcedfXcedf
committed
Readbacks proof of concept shadps4-emu#2668 
1 parent 2817e58 commit c4e747f

File tree

14 files changed

+413
-201
lines changed

14 files changed

+413
-201
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp
897897
src/video_core/buffer_cache/buffer.h
898898
src/video_core/buffer_cache/buffer_cache.cpp
899899
src/video_core/buffer_cache/buffer_cache.h
900-
src/video_core/buffer_cache/memory_tracker_base.h
900+
src/video_core/buffer_cache/memory_tracker.h
901901
src/video_core/buffer_cache/range_set.h
902902
src/video_core/buffer_cache/word_manager.h
903903
src/video_core/renderer_vulkan/liverpool_to_vk.cpp

‎src/core/address_space.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,14 +302,15 @@ struct AddressSpace::Impl {
302302
new_flags = PAGE_READWRITE;
303303
} else if (read && !write) {
304304
new_flags = PAGE_READONLY;
305-
} else if (execute && !read && not write) {
305+
} else if (execute && !read && !write) {
306306
new_flags = PAGE_EXECUTE;
307307
} else if (!read && !write && !execute) {
308308
new_flags = PAGE_NOACCESS;
309309
} else {
310310
LOG_CRITICAL(Common_Memory,
311-
"Unsupported protection flag combination for address {:#x}, size {}",
312-
virtual_addr, size);
311+
"Unsupported protection flag combination for address {:#x}, size {}, "
312+
"read={}, write={}, execute={}",
313+
virtual_addr, size, read, write, execute);
313314
return;
314315
}
315316

‎src/core/address_space.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
namespace Core {
1212

1313
enum class MemoryPermission : u32 {
14+
None = 0,
1415
Read = 1 << 0,
1516
Write = 1 << 1,
1617
ReadWrite = Read | Write,

‎src/video_core/amdgpu/liverpool.cpp

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Liverpool::~Liverpool() {
7474

7575
void Liverpool::Process(std::stop_token stoken) {
7676
Common::SetCurrentThreadName("shadPS4:GpuCommandProcessor");
77+
gpu_id = std::this_thread::get_id();
7778

7879
while (!stoken.stop_requested()) {
7980
{
@@ -606,9 +607,8 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
606607
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
607608
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
608609
dma_data->dst_sel == DmaDataDst::Gds) {
609-
rasterizer->InlineData(dma_data->dst_addr_lo,
610-
dma_data->SrcAddress<const void*>(),
611-
dma_data->NumBytes(), true);
610+
rasterizer->CopyBuffer(dma_data->dst_addr_lo, dma_data->SrcAddress<VAddr>(),
611+
dma_data->NumBytes(), true, false);
612612
} else if (dma_data->src_sel == DmaDataSrc::Data &&
613613
(dma_data->dst_sel == DmaDataDst::Memory ||
614614
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
@@ -617,14 +617,15 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
617617
} else if (dma_data->src_sel == DmaDataSrc::Gds &&
618618
(dma_data->dst_sel == DmaDataDst::Memory ||
619619
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
620-
// LOG_WARNING(Render_Vulkan, "GDS memory read");
620+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(), dma_data->src_addr_lo,
621+
dma_data->NumBytes(), false, true);
621622
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
622623
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
623624
(dma_data->dst_sel == DmaDataDst::Memory ||
624625
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
625-
rasterizer->InlineData(dma_data->DstAddress<VAddr>(),
626-
dma_data->SrcAddress<const void*>(),
627-
dma_data->NumBytes(), false);
626+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(),
627+
dma_data->SrcAddress<VAddr>(), dma_data->NumBytes(),
628+
false, false);
628629
} else {
629630
UNREACHABLE_MSG("WriteData src_sel = {}, dst_sel = {}",
630631
u32(dma_data->src_sel.Value()), u32(dma_data->dst_sel.Value()));
@@ -660,6 +661,9 @@ Liverpool::Task Liverpool::ProcessGraphics(std::span<const u32> dcb, std::span<c
660661
break;
661662
}
662663
case PM4ItOpcode::Rewind: {
664+
if (!rasterizer) {
665+
break;
666+
}
663667
const PM4CmdRewind* rewind = reinterpret_cast<const PM4CmdRewind*>(header);
664668
while (!rewind->Valid()) {
665669
YIELD_GFX();
@@ -796,8 +800,8 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
796800
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
797801
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
798802
dma_data->dst_sel == DmaDataDst::Gds) {
799-
rasterizer->InlineData(dma_data->dst_addr_lo, dma_data->SrcAddress<const void*>(),
800-
dma_data->NumBytes(), true);
803+
rasterizer->CopyBuffer(dma_data->dst_addr_lo, dma_data->SrcAddress<VAddr>(),
804+
dma_data->NumBytes(), true, false);
801805
} else if (dma_data->src_sel == DmaDataSrc::Data &&
802806
(dma_data->dst_sel == DmaDataDst::Memory ||
803807
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
@@ -806,14 +810,14 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
806810
} else if (dma_data->src_sel == DmaDataSrc::Gds &&
807811
(dma_data->dst_sel == DmaDataDst::Memory ||
808812
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
809-
// LOG_WARNING(Render_Vulkan, "GDS memory read");
813+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(), dma_data->src_addr_lo,
814+
dma_data->NumBytes(), false, true);
810815
} else if ((dma_data->src_sel == DmaDataSrc::Memory ||
811816
dma_data->src_sel == DmaDataSrc::MemoryUsingL2) &&
812817
(dma_data->dst_sel == DmaDataDst::Memory ||
813818
dma_data->dst_sel == DmaDataDst::MemoryUsingL2)) {
814-
rasterizer->InlineData(dma_data->DstAddress<VAddr>(),
815-
dma_data->SrcAddress<const void*>(), dma_data->NumBytes(),
816-
false);
819+
rasterizer->CopyBuffer(dma_data->DstAddress<VAddr>(), dma_data->SrcAddress<VAddr>(),
820+
dma_data->NumBytes(), false, false);
817821
} else {
818822
UNREACHABLE_MSG("WriteData src_sel = {}, dst_sel = {}",
819823
u32(dma_data->src_sel.Value()), u32(dma_data->dst_sel.Value()));
@@ -824,6 +828,9 @@ Liverpool::Task Liverpool::ProcessCompute(const u32* acb, u32 acb_dwords, u32 vq
824828
break;
825829
}
826830
case PM4ItOpcode::Rewind: {
831+
if (!rasterizer) {
832+
break;
833+
}
827834
const PM4CmdRewind* rewind = reinterpret_cast<const PM4CmdRewind*>(header);
828835
while (!rewind->Valid()) {
829836
YIELD_ASC(vqid);

‎src/video_core/amdgpu/liverpool.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,6 +1512,7 @@ struct Liverpool {
15121512
u32 tmp_dwords;
15131513
};
15141514
Common::SlotVector<AscQueueInfo> asc_queues{};
1515+
std::thread::id gpu_id;
15151516

15161517
private:
15171518
struct Task {

0 commit comments

Comments
 (0)