archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 22:11:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert pull request #15618

Browse source
This commit is contained in:
5kft 2024-06-30 21:35:59 -07:00 • committed by GitHub
parent 289b70d276
commit 6ddb21ab95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -19,7 +19,6 @@
#include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_event.h"
#include "Emu/Cell/lv2/sys_time.h" #include "Emu/Cell/lv2/sys_time.h"
#include "Emu/Cell/Modules/cellGcmSys.h" #include "Emu/Cell/Modules/cellGcmSys.h"
#include "Emu/Memory/vm_reservation.h"
#include "util/serialization_ext.hpp" #include "util/serialization_ext.hpp"
#include "Overlays/overlay_perf_metrics.h" #include "Overlays/overlay_perf_metrics.h"
#include "Overlays/overlay_debug_overlay.h" #include "Overlays/overlay_debug_overlay.h"
@ -3115,19 +3114,8 @@ namespace rsx
} }
} }
CellGcmReportData report_data{ timestamp(), value, 0}; rsx::reservation_lock<true> lock(sink, 16);
vm::_ref<atomic_t<CellGcmReportData>>(sink).store({timestamp(), value, 0});
if (sink < label_addr || sink >= label_addr + sizeof(RsxReports::report))
{
vm::light_op<false>(vm::_ref<atomic_t<CellGcmReportData>>(sink), [&](atomic_t<CellGcmReportData>& data)
{
data.release(report_data);
});
}
else
{
vm::_ref<atomic_t<CellGcmReportData>>(sink).store(report_data);
}
} }
u32 thread::copy_zcull_stats(u32 memory_range_start, u32 memory_range, u32 destination) u32 thread::copy_zcull_stats(u32 memory_range_start, u32 memory_range, u32 destination)

19
rpcs3/Emu/RSX/RSXZCULL.cpp
View file

@ -1,7 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Core/RSXEngLock.hpp" #include "Core/RSXEngLock.hpp"
#include "Core/RSXReservationLock.hpp" #include "Core/RSXReservationLock.hpp"
#include "Emu/Memory/vm_reservation.h"
#include "RSXThread.h" #include "RSXThread.h"
namespace rsx namespace rsx
@ -352,21 +351,9 @@ namespace rsx
break; break;
} }
const u32 label_addr = rsx::get_current_renderer()->label_addr; rsx::reservation_lock<true> lock(sink, 16);
auto report = vm::get_super_ptr<atomic_t<CellGcmReportData>>(sink);
CellGcmReportData report_data{ timestamp, value, 0 }; report->store({timestamp, value, 0});
if (sink < label_addr || sink >= label_addr + sizeof(RsxReports::report))
{
vm::light_op<false>(*vm::get_super_ptr<atomic_t<CellGcmReportData>>(sink), [&](atomic_t<CellGcmReportData>& data)
{
data.release(report_data);
});
}
else
{
vm::get_super_ptr<atomic_t<CellGcmReportData>>(sink)->store(report_data);
}
} }
void ZCULL_control::write(queued_report_write* writer, u64 timestamp, u32 value) void ZCULL_control::write(queued_report_write* writer, u64 timestamp, u32 value)