GS/HW: Point m_from_target to new target if it's also a source in CombineAlignedInsideTargets, update manual deswizzle.#13355
Merged
lightningterror merged 2 commits intomasterfrom Oct 7, 2025
Conversation
kamfretoz
approved these changes
Oct 5, 2025
Contributor
kamfretoz
left a comment
kamfretoz
left a comment
There was a problem hiding this comment.
Fixes crashing on both Enthusia and Stolen dump.
lightningterror
force-pushed
the
gs_merge_targets_src_tar
branch
from
0e7432c to
eca63fb
Compare
lightningterror
changed the title
lightningterror
changed the title
lightningterror
changed the title
…bineAlignedInsideTargets. Issue is it was erasing the source which doesn't get passed back to the main draw function, so we should be setting m_from_target to either new target or null because it is linked.
lightningterror
force-pushed
the
gs_merge_targets_src_tar
branch
from
f3b1ddd to
884ef26
Compare
lightningterror
changed the title
Check if a draw is either a palette or 32bit depth format, also check for swizzle format is 16 or 32bit. Expand/update quadrant detection, use the quadrant size of what it should be from the page size and compare it to the actual quadrant size from the vertex positions.
lightningterror
force-pushed
the
gs_merge_targets_src_tar
branch
from
884ef26 to
70d8546
Compare
JordanTheToaster
approved these changes
Oct 7, 2025
Member
JordanTheToaster
left a comment
JordanTheToaster
left a comment
There was a problem hiding this comment.
Fixes aforementioned crashes and a handful of random games all look okay.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description of Changes
GS/TC: Point m_from_target to new target if it's also a source in CombineAlignedInsideTargets.
Issue is it was erasing the source which doesn't get passed back to the main draw function, so we should be setting m_from_target to null because it is linked.
GS/HW: Update manual deswizzle detection.
Check if a draw is either a palette or 32bit depth format, also check for swizzle format is 16 or 32bit.
Expand/update quadrant detection, use the quadrant size of what it should be from the page size and compare it to the actual quadrant size from the vertex positions.
Rationale behind Changes
Crash fixes.
Fixes Stolen crashing and swizzle issues.
Fixes #13348
Suggested Testing Steps
Test mentioned games/issues with the dumps provided, test some other random stuff, dump run no issues.
Dump to crash test:
Stolen_SLUS-21099_20250916221711.gs.zip
Enthusia Professional Racing_SLES-53125_20251005045009.gs.zip
Did you use AI to help find, test, or implement this issue or feature?
No.
Stolen comparison:
