aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/servo/Cargo.lock4
-rw-r--r--ports/cef/Cargo.lock4
-rw-r--r--resources/shaders/ps_text_run.fs.glsl5
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);
}