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

update android port #41

Merged
merged 1 commit into from Dec 27, 2013
Merged

update android port #41

merged 1 commit into from Dec 27, 2013

Conversation

@aydinkim
Copy link
Contributor

aydinkim commented Dec 19, 2013

Pre-works for upgrading androidport of Servo.
Implement newer rendering structure for CPU and GPU on android.

@aydinkim
Copy link
Contributor Author

aydinkim commented Dec 20, 2013

Modified the API name to call. Mr. recrack had changed the PR in rust-opengles.

@aydinkim
Copy link
Contributor Author

aydinkim commented Dec 20, 2013

@aydinkim
Copy link
Contributor Author

aydinkim commented Dec 26, 2013

I fixed rendergl.rs in order to keep original shader source code to be correct.
I wrapped render context with Option so that we can pass only 2d shader on android.
Plz take a look and review it.

p.s> 8750941 is a hot fix of aeba4f4 above. I can merge them into one if you want.

@aydinkim
Copy link
Contributor Author

aydinkim commented Dec 27, 2013

@metajack How about this works? I'm curious this is acceptable or not.

@metajack
Copy link
Contributor

metajack commented Dec 27, 2013

It's acceptable assuming we don't need to switch back and forth.

@metajack
Copy link
Contributor

metajack commented Dec 27, 2013

And if we don't need to switch back and forth, why have both programs?

@aydinkim
Copy link
Contributor Author

aydinkim commented Dec 27, 2013

Squashed.

@metajack
Copy link
Contributor

metajack commented Dec 27, 2013

I'll merge this when build changes land.

@aydinkim
Copy link
Contributor Author

aydinkim commented Dec 27, 2013

No problem!

metajack added a commit that referenced this pull request Dec 27, 2013
@metajack metajack merged commit e8123ce into servo:master Dec 27, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.