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

Fix type mismatch in shared shader code #626

Merged
merged 1 commit into from Dec 12, 2016

Conversation

@mmatyas
Copy link
Contributor

mmatyas commented Dec 12, 2016

This fixes a Type mismatch, cannot convert from 'ivec2' to 'vec2' error produced by Servo on Android.

Related: servo/servo#13154


This change is Reviewable

@kvark
kvark approved these changes Dec 12, 2016
@glennw
Copy link
Member

glennw commented Dec 12, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2016

📌 Commit 2b747d1 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2016

Testing commit 2b747d1 with merge adc52e0...

bors-servo added a commit that referenced this pull request Dec 12, 2016
Fix type mismatch in shared shader code

This fixes a `Type mismatch, cannot convert from 'ivec2' to 'vec2'` error produced by Servo on Android.

Related: servo/servo#13154

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/626)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 12, 2016

☀️ Test successful - status-travis

@bors-servo bors-servo merged commit 2b747d1 into servo:master Dec 12, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
bors-servo added a commit that referenced this pull request Dec 14, 2016
Fix a type mismatch in `cs_blur.vs.glsl`

Similarly to #626.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/633)
<!-- Reviewable:end -->
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

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