diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-31 18:11:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 18:11:37 -0500 |
| commit | c69c6cf58bb31de36af98d4b84dfdec2724d5b5b (patch) | |
| tree | 83582add399034207b9e9f9fc095e903545e0f10 | |
| parent | 408caac66995810659eb19ec65d1100f2fcd1e01 (diff) | |
| parent | fddb45426dc2503d771aa7af0f5299aa1492c879 (diff) | |
| download | servo-c69c6cf58bb31de36af98d4b84dfdec2724d5b5b.tar.gz servo-c69c6cf58bb31de36af98d4b84dfdec2724d5b5b.zip | |
Auto merge of #14007 - glennw:update-wr-3d-text, r=pcwalton
Update WR - fixes for local clip rect + 3d transformed content.
<!-- 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/14007)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 4 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 4 | ||||
| -rw-r--r-- | resources/shaders/prim_shared.glsl | 23 |
3 files changed, 17 insertions, 14 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index be7ade81c54..0936aa8f0fc 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2658,7 +2658,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.8.0" -source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78" +source = "git+https://github.com/servo/webrender#cbdd312a88e80f8cca457f7d49128f51e819ebf1" 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)", @@ -2683,7 +2683,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.8.0" -source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78" +source = "git+https://github.com/servo/webrender#cbdd312a88e80f8cca457f7d49128f51e819ebf1" 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 eb159a59e02..754b36a64d0 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -2516,7 +2516,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.8.0" -source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78" +source = "git+https://github.com/servo/webrender#cbdd312a88e80f8cca457f7d49128f51e819ebf1" 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)", @@ -2541,7 +2541,7 @@ dependencies = [ [[package]] name = "webrender_traits" version = "0.8.0" -source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78" +source = "git+https://github.com/servo/webrender#cbdd312a88e80f8cca457f7d49128f51e819ebf1" 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/prim_shared.glsl b/resources/shaders/prim_shared.glsl index 08afa6cd2e2..c273ee1fad5 100644 --- a/resources/shaders/prim_shared.glsl +++ b/resources/shaders/prim_shared.glsl @@ -439,6 +439,10 @@ vec4 get_layer_pos(vec2 pos, Layer layer) { return untransform(pos, n, a, layer.inv_transform); } +vec2 clamp_rect(vec2 point, vec4 rect) { + return clamp(point, rect.xy, rect.xy + rect.zw); +} + struct Rect { vec2 p0; vec2 p1; @@ -463,9 +467,7 @@ VertexInfo write_vertex(vec4 instance_rect, vec2 cp1 = floor(0.5 + (local_clip_rect.xy + local_clip_rect.zw) * uDevicePixelRatio) / uDevicePixelRatio; local_pos = clamp(local_pos, cp0, cp1); - local_pos = clamp(local_pos, - layer.local_clip_rect.xy, - layer.local_clip_rect.xy + layer.local_clip_rect.zw); + local_pos = clamp_rect(local_pos, layer.local_clip_rect); vec4 world_pos = layer.transform * vec4(local_pos, 0, 1); world_pos.xyz /= world_pos.w; @@ -495,15 +497,16 @@ struct TransformVertexInfo { }; TransformVertexInfo write_transform_vertex(vec4 instance_rect, - vec4 local_clip_rect, //unused + vec4 local_clip_rect, Layer layer, Tile tile) { - vec2 lp0 = clamp(instance_rect.xy, - layer.local_clip_rect.xy, - layer.local_clip_rect.xy + layer.local_clip_rect.zw); - vec2 lp1 = clamp(instance_rect.xy + instance_rect.zw, - layer.local_clip_rect.xy, - layer.local_clip_rect.xy + layer.local_clip_rect.zw); + vec2 lp0_base = instance_rect.xy; + vec2 lp1_base = instance_rect.xy + instance_rect.zw; + + vec2 lp0 = clamp_rect(clamp_rect(lp0_base, local_clip_rect), + layer.local_clip_rect); + vec2 lp1 = clamp_rect(clamp_rect(lp1_base, local_clip_rect), + layer.local_clip_rect); vec4 clipped_local_rect = vec4(lp0, lp1 - lp0); |