Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-08 07:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13478 - mmatyas:arm_gles3, r=jdm

Browse source 
Use GL ES3 on ARM devices

<!-- Please describe your changes on the following line: -->
This makes WebRender work on ARM devices; see servo/webrender#408.

---
<!-- 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] `PKG_CONFIG_ALLOW_CROSS=1 PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig HARFBUZZ_NO_PKG_CONFIG=1 EXPAT_NO_PKG_CONFIG=1 FREETYPE2_NO_PKG_CONFIG=1 FONTCONFIG_NO_PKG_CONFIG=1 CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ ./mach build --dev --target=arm-unknown-linux-gnueabihf` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #10310.

<!-- 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/13478)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-30 14:49:29 -05:00 • committed by GitHub
commit a559c20353
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/glutin/window.rs
View file

@ -317,7 +317,7 @@ impl Window {
} }
} }
#[cfg(not(target_os = "android"))] #[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
fn gl_version() -> GlRequest { fn gl_version() -> GlRequest {
if opts::get().use_webrender { if opts::get().use_webrender {
return GlRequest::Specific(Api::OpenGl, (3, 2)); return GlRequest::Specific(Api::OpenGl, (3, 2));
@ -332,7 +332,7 @@ impl Window {
} }
} }
#[cfg(target_os = "android")] #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
fn gl_version() -> GlRequest { fn gl_version() -> GlRequest {
GlRequest::Specific(Api::OpenGlEs, (3, 0)) GlRequest::Specific(Api::OpenGlEs, (3, 0))
} }