nv2a: Resolve overlapped dirty draws during 2d blit ops #2211
+103
−53
Conversation
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
|
well done, looks fixed to me. |
abaire
force-pushed
the
fix_950_clear_overlapped_dirty_draw_during_2d_blit
branch
from
29700f4 to
a394185
Compare
mborgerson
reviewed
Jun 3, 2025
hw/xbox/nv2a/pgraph/gl/blit.c
Outdated
|
|
||
| // TODO: clear dirty_draw flag on surfaces without download if they are fully overlapped. | ||
| hwaddr write_end = dest_addr + dest_offset + image_blit->height * context_surfaces->dest_pitch - 1; | ||
| pgraph_gl_download_surfaces_in_range_if_dirty(d, dest_addr + dest_offset, write_end); |
There was a problem hiding this comment.
- This should obsolete the above surface download that matches only on exact blit dest/surface address matches
- We should also download dirty surfaces overlapping the blit source region (like the above primitive check)
- re:TODO, we can only discard dirty surface data fully contained within blit dest region if we know the surface falls outside the blit source region, but it should be downloaded already by above point
- We should also mark any surfaces overlapping blit dest region for upload since their data are certainly changed
There was a problem hiding this comment.
- Removed the download above
- Expanded the source region test to use the same range behavior
- Yes, I think the source & dest overlap case would already sort itself out before this point. The clear would just be an optimization for completely contained dest surfaces where the blit bounds fully contain the surface. It didn't feel like enough of an optimization to justify the complexity without a known perf problem.
- Expanded the upload pending mark to work on ranges as well.
There was a problem hiding this comment.
I also took the opportunity to simplify some of the address handling, I think we were only hanging on to the raw addresses for an old obsolete debug print so I removed it.
abaire
force-pushed
the
fix_950_clear_overlapped_dirty_draw_during_2d_blit
branch
2 times, most recently
from
ee00b9e to
fa94a22
Compare
abaire
force-pushed
the
fix_950_clear_overlapped_dirty_draw_during_2d_blit
branch
from
fa94a22 to
3226bfb
Compare
abaire
force-pushed
the
fix_950_clear_overlapped_dirty_draw_during_2d_blit
branch
from
3226bfb to
8e57422
Compare
abaire
force-pushed
the
fix_950_clear_overlapped_dirty_draw_during_2d_blit
branch
from
8e57422 to
20395e3
Compare
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.
Fixes #950
Fixes #2199
Test results