mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 11:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cellGemUpdateStart/Finish error checking improved

Browse source 
* camera_frame = NULL is now checked for CELL_GEM_NO_VIDEO (applied both on start and finish)
* camera_frame = NULL on Start() still starts the update
* Implemented NOT_FINISHED/STARTED

All of those were reversed and hw tested.
This commit is contained in:
Eladash 2019-10-04 15:37:49 +03:00 • committed by Ivan
parent 278050f8d0
commit af417c93d0
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
rpcs3/Emu/Cell/Modules/cellGem.cpp
View file

@ -104,6 +104,10 @@ struct gem_config
std::array<gem_controller, CELL_GEM_MAX_NUM> controllers;
u32 connected_controllers;
bool update_started{};
u32 camera_frame{};
shared_mutex mtx;
Timer timer;
@ -1064,6 +1068,18 @@ error_code cellGemUpdateFinish()
return CELL_GEM_ERROR_UNINITIALIZED;
}
std::scoped_lock lock(gem->mtx);
if (!std::exchange(gem->update_started, false))
{
return CELL_GEM_ERROR_UPDATE_NOT_STARTED;
}
if (!gem->camera_frame)
{
return CELL_GEM_NO_VIDEO;
}
return CELL_OK;
}
@ -1078,9 +1094,18 @@ error_code cellGemUpdateStart(vm::cptr<void> camera_frame, u64 timestamp)
return CELL_GEM_ERROR_UNINITIALIZED;
}
std::scoped_lock lock(gem->mtx);
// Update is starting even when camera_frame is null
if (std::exchange(gem->update_started, true))
{
return CELL_GEM_ERROR_UPDATE_NOT_FINISHED;
}
gem->camera_frame = camera_frame.addr();
if (!camera_frame)
{
return CELL_GEM_ERROR_INVALID_PARAMETER;
return CELL_GEM_NO_VIDEO;
}
return CELL_OK;