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

ANDROID: Rewrite to make use of OpenGLGraphicsManager #1695

Merged
merged 2 commits into from Sep 8, 2019

Conversation

@ccawley2011
Copy link
Member

commented Jun 21, 2019

Previously, the Android backend used its own custom OpenGL code for rendering. This PR replaces that with the common OpenGL rendering code.

This is not finished. It's just about usable, but there are still several major caveats regarding this PR:

  • Touchpad mouse mode is broken.
  • ScummVM may crash when returning from the background. This appears to be an issue with or without this PR.
  • D-pad, Trackball and Joystick events have not been tested.

However, I'm currently stuck regarding how to fix these issues, so I've opened this PR anyway in the hope that someone else might be able to help with this.

@ccawley2011 ccawley2011 force-pushed the ccawley2011:android-opengl branch from 017084c to 56b721f Jun 23, 2019

@ccawley2011 ccawley2011 force-pushed the ccawley2011:android-opengl branch 3 times, most recently from cb42242 to f79e89f Jul 30, 2019

@ccawley2011 ccawley2011 force-pushed the ccawley2011:android-opengl branch 2 times, most recently from f253657 to 56df1de Aug 8, 2019

@ccawley2011 ccawley2011 marked this pull request as ready for review Aug 12, 2019

@ccawley2011 ccawley2011 force-pushed the ccawley2011:android-opengl branch from 56df1de to 4861de5 Aug 18, 2019

@bluegr

This comment has been minimized.

Copy link
Member

commented Aug 20, 2019

Overall, great work! It's good that you managed to reuse the common OpenGL code for Android :)

Could you please fix the conflicts in events.cpp?

Have you played any games with these changes? (with 320x200 and higher resolutions as well)

@ccawley2011 ccawley2011 force-pushed the ccawley2011:android-opengl branch from 4861de5 to 16f8012 Aug 20, 2019

@ccawley2011

This comment has been minimized.

Copy link
Member Author

commented Aug 20, 2019

Have you played any games with these changes? (with 320x200 and higher resolutions as well)

Yes, I've tested this with a number of games over the last couple of months, and they all work fine.

@bluegr

This comment has been minimized.

Copy link
Member

commented Aug 25, 2019

This looks good to be merged. If there are no objections, I would like to have this merged by next weekend (Sunday, the 1st of September)

@ccawley2011 ccawley2011 merged commit 7a05624 into scummvm:master Sep 8, 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:android-opengl branch Sep 8, 2019

@bluegr

This comment has been minimized.

Copy link
Member

commented Sep 8, 2019

I had forgotten about this, thanks for merging it!

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.