Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upSet the correct Angle GLSL output when using WebGL 2 #19192
Merged
+99
−621
Conversation
highfive
commented
Nov 12, 2017
components/script/dom/webglshader.rs
Outdated
| const SHADER_OUTPUT_FORMAT: Output = Output::Glsl; | ||
| #[cfg(not(any(target_os = "android", target_os = "ios")))] | ||
| const SHADER_OUTPUT_FORMAT_WEBGL1: Output = Output::Glsl; | ||
| // MacOS Requires Glsl150Core because it uses a OpenGL 3.2 Core Context. |
This comment has been minimized.
This comment has been minimized.
anholt
Nov 12, 2017
Contributor
Instead of a bunch of per-OS hacks here, we should probably be looking at SHADING_LANGUAGE_VERSION
This comment has been minimized.
This comment has been minimized.
MortimerGoro
Nov 12, 2017
Author
Contributor
Great idea! I'll update the PR to use SHADING_LANGUAGE_VERSION
|
Updated the PR to use SHADING_LANGUAGE_VERSION |
|
@bors-servo: r+ |
|
|
bors-servo
added a commit
that referenced
this pull request
Nov 13, 2017
Set the correct Angle GLSL output when using WebGL 2 Set the correct Angle GLSL output when using WebGL 2 <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19192) <!-- Reviewable:end -->
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
MortimerGoro commentedNov 12, 2017
•
edited by SimonSapin
Set the correct Angle GLSL output when using WebGL 2
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is