Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MEDIASTATION: Make use of simpleBlitFrom #6394

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

ccawley2011
Copy link
Member

This should be straight forward since the engine exclusively uses paletted surfaces and doesn't seem to need scaling or palette remapping, but I haven't been able to test it.

@ccawley2011 ccawley2011 requested a review from npjg January 5, 2025 20:49
@npjg
Copy link
Member

npjg commented Jan 8, 2025

Based on what is implemented thus far in this engine, this looks fine. I appreciate the improvement!

@npjg
Copy link
Member

npjg commented Jan 8, 2025

For merging this, is the correct merge option "Squash and merge" or "Rebase and merge"? For a PR with 1 commit, does it really matter? Is there a preference in this case?

@bluegr
Copy link
Member

bluegr commented Jan 8, 2025

Thanks @npjg!

In most cases, we rebase and merge. The only case where we squash is when we want to avoid polluting history with unneeded commits, or we want to fix commit messages in PRs that only have a single commit with a wrong message.

In this case, we can just merge. Merging

@bluegr bluegr merged commit 67b3afc into scummvm:master Jan 8, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants