mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-02 22:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into GUI-Work

Browse source
This commit is contained in:
Megamouse 2024-12-28 20:56:10 +01:00 • committed by GitHub
commit c30a82f5d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
darwin/util/sysinfo_darwin.mm
View file

@ -1,5 +1,7 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast" #pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

12
rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp
View file

@ -622,7 +622,7 @@ bool spursKernel2SelectWorkload(spu_thread& spu)
void spursKernelDispatchWorkload(spu_thread& spu, u64 widAndPollStatus) void spursKernelDispatchWorkload(spu_thread& spu, u64 widAndPollStatus)
{ {
const auto ctxt = spu._ptr<SpursKernelContext>(0x100); const auto ctxt = spu._ptr<SpursKernelContext>(0x100);
auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
auto pollStatus = static_cast<u32>(widAndPollStatus); auto pollStatus = static_cast<u32>(widAndPollStatus);
auto wid = static_cast<u32>(widAndPollStatus >> 32); auto wid = static_cast<u32>(widAndPollStatus >> 32);
@ -674,7 +674,7 @@ void spursKernelDispatchWorkload(spu_thread& spu, u64 widAndPollStatus)
bool spursKernelWorkloadExit(spu_thread& spu) bool spursKernelWorkloadExit(spu_thread& spu)
{ {
const auto ctxt = spu._ptr<SpursKernelContext>(0x100); const auto ctxt = spu._ptr<SpursKernelContext>(0x100);
auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
// Select next workload to run // Select next workload to run
spu.gpr[3].clear(); spu.gpr[3].clear();
@ -701,7 +701,7 @@ bool spursKernelEntry(spu_thread& spu)
ctxt->spuNum = spu.gpr[3]._u32[3]; ctxt->spuNum = spu.gpr[3]._u32[3];
ctxt->spurs.set(spu.gpr[4]._u64[1]); ctxt->spurs.set(spu.gpr[4]._u64[1]);
auto isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false; const bool isKernel2 = ctxt->spurs->flags1 & SF1_32_WORKLOADS ? true : false;
// Initialise the SPURS context to its initial values // Initialise the SPURS context to its initial values
ctxt->dmaTagId = CELL_SPURS_KERNEL_DMA_TAG_ID; ctxt->dmaTagId = CELL_SPURS_KERNEL_DMA_TAG_ID;
@ -785,8 +785,8 @@ void spursSysServiceIdleHandler(spu_thread& spu, SpursKernelContext* ctxt)
} }
} }
bool allSpusIdle = nIdlingSpus == spurs->nSpus ? true : false; const bool allSpusIdle = nIdlingSpus == spurs->nSpus;
bool exitIfNoWork = spurs->flags1 & SF1_EXIT_IF_NO_WORK ? true : false; const bool exitIfNoWork = spurs->flags1 & SF1_EXIT_IF_NO_WORK ? true : false;
shouldExit = allSpusIdle && exitIfNoWork; shouldExit = allSpusIdle && exitIfNoWork;
// Check if any workloads can be scheduled // Check if any workloads can be scheduled
@ -843,7 +843,7 @@ void spursSysServiceIdleHandler(spu_thread& spu, SpursKernelContext* ctxt)
} }
} }
bool spuIdling = spurs->spuIdling & (1 << ctxt->spuNum) ? true : false; const bool spuIdling = spurs->spuIdling & (1 << ctxt->spuNum) ? true : false;
if (foundReadyWorkload && shouldExit == false) if (foundReadyWorkload && shouldExit == false)
{ {
spurs->spuIdling &= ~(1 << ctxt->spuNum); spurs->spuIdling &= ~(1 << ctxt->spuNum);

4
rpcs3/Input/gui_pad_thread.cpp
View file

@ -27,6 +27,10 @@
#elif defined(__APPLE__) #elif defined(__APPLE__)
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast" #pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#pragma GCC diagnostic ignored "-Wnullability-completeness"
#pragma GCC diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion"
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

1
rpcs3/rpcs3.vcxproj
View file

@ -2069,6 +2069,7 @@
<None Include="..\buildfiles\msvc\rpcs3_debug.props" /> <None Include="..\buildfiles\msvc\rpcs3_debug.props" />
<None Include="..\buildfiles\msvc\rpcs3_default.props" /> <None Include="..\buildfiles\msvc\rpcs3_default.props" />
<None Include="..\buildfiles\msvc\rpcs3_release.props" /> <None Include="..\buildfiles\msvc\rpcs3_release.props" />
<None Include="..\darwin\util\sysinfo_darwin.mm" />
<None Include="..\Utilities\git-version-gen.cmd" /> <None Include="..\Utilities\git-version-gen.cmd" />
<None Include="update_helper.sh" /> <None Include="update_helper.sh" />
</ItemGroup> </ItemGroup>

6
rpcs3/rpcs3.vcxproj.filters
View file

@ -190,6 +190,9 @@
<Filter Include="Io\Move"> <Filter Include="Io\Move">
<UniqueIdentifier>{f8a98f7b-dc23-47c0-8a5f-d0b76eaf0df5}</UniqueIdentifier> <UniqueIdentifier>{f8a98f7b-dc23-47c0-8a5f-d0b76eaf0df5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Darwin">
<UniqueIdentifier>{f6b701aa-7f4a-4816-b05f-80d24cb70e13}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
@ -1806,5 +1809,8 @@
<None Include="..\.ci\optimize-mac.sh"> <None Include="..\.ci\optimize-mac.sh">
<Filter>CI</Filter> <Filter>CI</Filter>
</None> </None>
<None Include="..\darwin\util\sysinfo_darwin.mm">
<Filter>Darwin</Filter>
</None>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
rpcs3/rpcs3qt/gui_settings.cpp
View file

@ -206,7 +206,7 @@ bool gui_settings::GetBootConfirmation(QWidget* parent, const gui_save& gui_save
{ {
if (Emu.GetStatus(false) != system_state::stopping) if (Emu.GetStatus(false) != system_state::stopping)
{ {
ensure(info == Emu.GetEmulationIdentifier(old_status == system_state::stopping ? true : false)); ensure(info == Emu.GetEmulationIdentifier(old_status == system_state::stopping));
return true; return true;
} }