diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-05 03:41:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 03:41:13 -0500 |
| commit | 8a3af9d1b9fe55a802d6463f6e4a5dbf39a1ecff (patch) | |
| tree | 6c00405334699e1910d051b932b94c5e5dfc05a6 | |
| parent | 30cf58eae8ff9a20fef630998311be3e49a479c7 (diff) | |
| parent | fffa93082bbe56a99d65121b85cda5b5599a5d93 (diff) | |
| download | servo-8a3af9d1b9fe55a802d6463f6e4a5dbf39a1ecff.tar.gz servo-8a3af9d1b9fe55a802d6463f6e4a5dbf39a1ecff.zip | |
Auto merge of #13592 - glennw:update-wr-text-runs, r=pcwalton
Update webrender (text run + transforms fix).
<!-- 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/13592)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 4 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 4 | ||||
| -rw-r--r-- | resources/shaders/ps_text_run.fs.glsl | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index e6c73ef7b1e..2431f2e6438 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2697,7 +2697,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.5.1" -source = "git+https://github.com/servo/webrender#dfa4246ebe40c78882cdd3e69e776b1e09a2f58e" +source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2722,7 +2722,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.5.1" -source = "git+https://github.com/servo/webrender#dfa4246ebe40c78882cdd3e69e776b1e09a2f58e" +source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index cf6a99a43d9..26291bc0f5d 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2556,7 +2556,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.5.1" -source = "git+https://github.com/servo/webrender#dfa4246ebe40c78882cdd3e69e776b1e09a2f58e" +source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.5.1" -source = "git+https://github.com/servo/webrender#dfa4246ebe40c78882cdd3e69e776b1e09a2f58e" +source = "git+https://github.com/servo/webrender#f200389d12b30764f9c9d2401cebe6ff8c9eee50" dependencies = [ "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/resources/shaders/ps_text_run.fs.glsl b/resources/shaders/ps_text_run.fs.glsl index 175102f790e..79051beb583 100644 --- a/resources/shaders/ps_text_run.fs.glsl +++ b/resources/shaders/ps_text_run.fs.glsl @@ -4,5 +4,10 @@ void main(void) { float a = texture(sDiffuse, vUv).a; +#ifdef WR_FEATURE_TRANSFORM + float alpha = 0.0; + init_transform_fs(vLocalPos, vLocalRect, alpha); + a *= alpha; +#endif oFragColor = vec4(vColor.rgb, vColor.a * a); } |