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

SCUMM: Remove direct use of Graphics::Surface from ARM code #2931

Merged
merged 2 commits into from May 3, 2021

Conversation

@ccawley2011
Copy link
Member

@ccawley2011 ccawley2011 commented Apr 8, 2021

No description provided.

@digitall
Copy link
Member

@digitall digitall commented Apr 27, 2021

@ccawley2011 : Could you resolve the conflicts on this and rebase?

@digitall
Copy link
Member

@digitall digitall commented Apr 27, 2021

@sev- : I don't know who should review this ARM code as the previous developers who have touched this all seem to be retired. @ccawley2011 seems to know what he is doing so OK to merge or do you want to check this?

@digitall digitall requested a review from sev- Apr 27, 2021
@sev-
Copy link
Member

@sev- sev- commented Apr 27, 2021

I see that the last platform which was using ARM code was Symbian, but even there we have it now commented out.

Shall we perhaps just remove this file altogether?

@bluegr
Copy link
Member

@bluegr bluegr commented Apr 28, 2021

I agree that this could be removed, as it's no longer used - USE_ARM_COSTUME_ASM is no longer enabled anywhere
Same goes for USE_ARM_SOUND_ASM and its associated code

Both features have been disabled and are unused and no longer maintained for at least 6 - 7 years

@digitall
Copy link
Member

@digitall digitall commented May 1, 2021

I would suggest accepting this change then and merging... then removing the usage of the ARM code in a further commit thus this is still in the history if this is reverted later.

@sev-
Copy link
Member

@sev- sev- commented May 1, 2021

Good point. Merging.

@sev-
Copy link
Member

@sev- sev- commented May 1, 2021

Oh, it requires rebase. @ccawley2011 could you please do it?

@bluegr
Copy link
Member

@bluegr bluegr commented May 3, 2021

Thanks for your work!
I've solved the conflict, it was just whitespace. I'm squashing this.

@bluegr bluegr merged commit d02daae into scummvm:master May 3, 2021
1 of 3 checks passed
1 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@deepcode-ci-bot
deepcode-ci-bot DeepCode is checking for issues.
@codacy-production
Codacy Static Code Analysis Codacy Static Code Analysis
Details
@ccawley2011 ccawley2011 deleted the ccawley2011:scumm-asm-surface branch May 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants