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

Auto merge of #20632 - Eijebong:osmesa, r=jdm

Browse source 
Update osmesa-src

<!-- 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/20632)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-05-18 16:41:24 -04:00 • committed by GitHub
commit 4ff3389c90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -2137,8 +2137,8 @@ dependencies = [
[[package]]
name = "osmesa-src"
version = "17.3.1-devel"
source = "git+https://github.com/servo/osmesa-src#6d23daede16f7edf7c66bdcce73c7583d0853733"
version = "18.1.0-devel"
source = "git+https://github.com/servo/osmesa-src#25825d4ca357cdaf540f20fafc545f5aff1aa355"
[[package]]
name = "osmesa-sys"
@ -2748,7 +2748,7 @@ dependencies = [
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libservo 0.0.1",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"osmesa-src 17.3.1-devel (git+https://github.com/servo/osmesa-src)",
"osmesa-src 18.1.0-devel (git+https://github.com/servo/osmesa-src)",
"osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3982,7 +3982,7 @@ dependencies = [
"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985"
"checksum openssl-sys 0.9.27 (registry+https://github.com/rust-lang/crates.io-index)" = "d6fdc5c4a02e69ce65046f1763a0181107038e02176233acb0b3351d7cc588f9"
"checksum ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da12c96037889ae0be29dd2bdd260e5a62a7df24e6466d5a15bb8131c1c200a8"
"checksum osmesa-src 17.3.1-devel (git+https://github.com/servo/osmesa-src)" = "<none>"
"checksum osmesa-src 18.1.0-devel (git+https://github.com/servo/osmesa-src)" = "<none>"
"checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
"checksum ovr-mobile-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a69b517feac6fc640f0679625defa0998bbcb32871a6901e63063c2abf9c4cbe"
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"

3
tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/one-large-uniform-buffer.html.ini
View file

@ -1,4 +1,5 @@
[one-large-uniform-buffer.html]
[WebGL test #1: Failed to set up the program]
expected: ERROR
[WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL

2
tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/uniform-buffers.html.ini
View file

@ -21,7 +21,7 @@
[WebGL test #12: getError expected: INVALID_OPERATION. Was INVALID_ENUM : binding a deleted buffer should generate INVALID_OPERATION]
expected: FAIL
[WebGL test #15: Could not compile shader with uniform blocks without error]
[WebGL test #15: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL
[WebGL test #16: Could not compile shader with named uniform blocks without error]

2
tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/glsl3/shader-with-mis-matching-uniform-block.html.ini
View file

@ -1,5 +1,5 @@
[shader-with-mis-matching-uniform-block.html]
[WebGL test #0: [unexpected vertex shader compile status\] (expected: true) Shaders with precision mis-matching uniform blocks should fail]
[WebGL test #0: [unexpected link status\] Shaders with precision mis-matching uniform blocks should fail]
expected: FAIL
[WebGL test #1: [unexpected fragment shader compile status\] (expected: true) Shaders with precision mis-matching uniform blocks should fail]

3
tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/rendering/uniform-block-buffer-size.html.ini
View file

@ -1,5 +1,6 @@
[uniform-block-buffer-size.html]
[WebGL test #1: Could not compile shader with uniform blocks without error]
expected: ERROR
[WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL
[WebGL test #2: Could not compile shader with uniform blocks without error]