Fix Hamilton's Great Adventure #3427
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@flash-fire, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jarveson, @Nekotekina and @kd-11 to be potential reviewers. |
|
|
flash-fire
force-pushed
the
rsx_patch
branch
2 times, most recently
from
b12cb3c to
84b6c57
Compare
kd-11
approved these changes
Sep 13, 2017
flash-fire
force-pushed
the
rsx_patch
branch
from
84b6c57 to
68763ae
Compare
kd-11
reviewed
Sep 14, 2017
rpcs3/Emu/Cell/lv2/sys_rsx.cpp
Outdated
| { | ||
| // Hamilton's Great Adventure [NPUB30458] calls this function before calling allocate. Not sure if race condition. | ||
| sys_rsx.error("sys_rsx_context_attribute called before sys_rsx_context_allocate: context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6); | ||
| return CELL_ESRCH; |
There was a problem hiding this comment.
Just change to EINVAL to match real hw
There was a problem hiding this comment.
Fixed and rebased. Sorry I don't pay attention to github notifications.
There was a problem hiding this comment.
If handling that matches real console behavior then it shouldn't have the "Not sure if it's race condition" comment as it's correct (?)
flash-fire
force-pushed
the
rsx_patch
branch
from
68763ae to
31518a2
Compare
…ocate. This inevitably causes RPCS3 to crash. Add nullptr check to prevent this.
flash-fire
force-pushed
the
rsx_patch
branch
from
31518a2 to
595a2f0
Compare
|
For future reference, the behavior implemented here has been tested on a real PS3 and it was confirmed correct. Merging as soon as it finishes building. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This game calls sys_rsx_context_attribute before sys_rsx_memory_allocate. This inevitably causes a crash. So, I return that the resource doesn't exist. Doesn't seem like a race condition because the main thread asks for the context before the rendering thread is even created. Could be wrong though so I left that in as a comment.