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

SDL: Move selecting the required ScalerProc into a separate function #1773

Merged
merged 1 commit into from Aug 11, 2019

Conversation

@ccawley2011
Copy link
Member

commented Jul 26, 2019

The implementation of setGraphicsModeIntern() in the GPH, Dingux and LinuxMoto backends are not quite identical to the base SDL backend, however the only differences are the call to updateShaders() (which does nothing on platforms other than the PS Vita) and the code for setting _scalerType (which shouldn't make a difference since s_gfxModeSwitchTable doesn't contain any reference to GFX_HALF). As such, this change should be harmless.

@ccawley2011 ccawley2011 requested a review from djwillis Jul 26, 2019

@bluegr

This comment has been minimized.

Copy link
Member

commented Jul 27, 2019

Nice work!

However, you have also removed the call to blitCursor() - isn't that needed?
Also, this has conflicts now, which need to be addressed before it can be merged

@ccawley2011

This comment has been minimized.

Copy link
Member Author

commented Aug 10, 2019

blitCursor() is still called in setGraphicsModeIntern() in the parent class, which is no longer overridden by the relevant subclasses.

@ccawley2011 ccawley2011 force-pushed the ccawley2011:scalerProc branch from 0bea51a to 7a21e75 Aug 10, 2019

@bluegr

This comment has been minimized.

Copy link
Member

commented Aug 11, 2019

Indeed. Thanks for resolving the conflicts. Nice work! Merging

@bluegr bluegr merged commit 9b64611 into scummvm:master Aug 11, 2019

2 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ccawley2011 ccawley2011 deleted the ccawley2011:scalerProc branch Aug 11, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.