Update WR - text + 3d transform fix, android build fix, documentation.

components/servo/Cargo.lock

@@ -2660,7 +2660,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.8.0"
-source = "git+https://github.com/servo/webrender#d44b1ffd3ea9e9e97ef7a70c1ac0f53bbd626850"
+source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78"
 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)",
@@ -2685,7 +2685,7 @@ dependencies = [
 [[package]]
 name = "webrender_traits"
 version = "0.8.0"
-source = "git+https://github.com/servo/webrender#d44b1ffd3ea9e9e97ef7a70c1ac0f53bbd626850"
+source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78"
 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)",

ports/cef/Cargo.lock

@@ -2518,7 +2518,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.8.0"
-source = "git+https://github.com/servo/webrender#d44b1ffd3ea9e9e97ef7a70c1ac0f53bbd626850"
+source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78"
 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)",
@@ -2543,7 +2543,7 @@ dependencies = [
 [[package]]
 name = "webrender_traits"
 version = "0.8.0"
-source = "git+https://github.com/servo/webrender#d44b1ffd3ea9e9e97ef7a70c1ac0f53bbd626850"
+source = "git+https://github.com/servo/webrender#97e5a6eeb5b0e399fa091091c193a146e5805d78"
 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)",

resources/shaders/prim_shared.glsl

@@ -115,8 +115,8 @@ Layer fetch_layer(int index) {
 
     layer.screen_vertices[0] = texelFetchOffset(sLayers, uv1, 0, ivec2(1, 0));
     layer.screen_vertices[1] = texelFetchOffset(sLayers, uv1, 0, ivec2(2, 0));
-    layer.screen_vertices[2] = texelFetchOffset(sLayers, uv1, 0, ivec2(2, 0));
+    layer.screen_vertices[2] = texelFetchOffset(sLayers, uv1, 0, ivec2(3, 0));
-    layer.screen_vertices[3] = texelFetchOffset(sLayers, uv1, 0, ivec2(3, 0));
+    layer.screen_vertices[3] = texelFetchOffset(sLayers, uv1, 0, ivec2(4, 0));
 
     return layer;
 }
@@ -390,11 +390,14 @@ ClipInfo fetch_clip(int index) {
     clip.top_right = fetch_clip_corner(index + 2);
     clip.bottom_left = fetch_clip_corner(index + 3);
     clip.bottom_right = fetch_clip_corner(index + 4);
-    clip.mask_info = fetch_mask_info(index+5);
+    clip.mask_info = fetch_mask_info(index + 5);
 
     return clip;
 }
 
+// Return the intersection of the plane (set up by "normal" and "point")
+// with the ray (set up by "ray_origin" and "ray_dir"),
+// writing the resulting scaler into "t".
 bool ray_plane(vec3 normal, vec3 point, vec3 ray_origin, vec3 ray_dir, out float t)
 {
     float denom = dot(normal, ray_dir);
@@ -407,25 +410,33 @@ bool ray_plane(vec3 normal, vec3 point, vec3 ray_origin, vec3 ray_dir, out float
     return false;
 }
 
+// Apply the inverse transform "inv_transform"
+// to the reference point "ref" in CSS space,
+// producing a local point on a layer plane,
+// set by a base point "a" and a normal "n".
 vec4 untransform(vec2 ref, vec3 n, vec3 a, mat4 inv_transform) {
     vec3 p = vec3(ref, -10000.0);
     vec3 d = vec3(0, 0, 1.0);
 
-    float t;
+    float t = 0.0;
+    // get an intersection of the layer plane with Z axis vector,
+    // originated from the "ref" point
     ray_plane(n, a, p, d, t);
-    vec3 c = p + d * t;
+    float z = p.z + d.z * t; // Z of the visible point on the layer
 
-    vec4 r = inv_transform * vec4(c, 1.0);
+    vec4 r = inv_transform * vec4(ref, z, 1.0);
     return r;
 }
 
-vec3 get_layer_pos(vec2 pos, Layer layer) {
+// Given a CSS space position, transform it back into the layer space.
+vec4 get_layer_pos(vec2 pos, Layer layer) {
+    // get 3 of the layer corners in CSS space
     vec3 a = layer.screen_vertices[0].xyz / layer.screen_vertices[0].w;
     vec3 b = layer.screen_vertices[3].xyz / layer.screen_vertices[3].w;
     vec3 c = layer.screen_vertices[2].xyz / layer.screen_vertices[2].w;
+    // get the normal to the layer plane
     vec3 n = normalize(cross(b-a, c-a));
-    vec4 local_pos = untransform(pos, n, a, layer.inv_transform);
+    return untransform(pos, n, a, layer.inv_transform);
-    return local_pos.xyw;
 }
 
 struct Rect {
@@ -453,8 +464,8 @@ VertexInfo write_vertex(vec4 instance_rect,
     local_pos = clamp(local_pos, cp0, cp1);
 
     local_pos = clamp(local_pos,
-                      vec2(layer.local_clip_rect.xy),
+                      layer.local_clip_rect.xy,
-                      vec2(layer.local_clip_rect.xy + layer.local_clip_rect.zw));
+                      layer.local_clip_rect.xy + layer.local_clip_rect.zw);
 
     vec4 world_pos = layer.transform * vec4(local_pos, 0, 1);
     world_pos.xyz /= world_pos.w;
@@ -462,13 +473,13 @@ VertexInfo write_vertex(vec4 instance_rect,
     vec2 device_pos = world_pos.xy * uDevicePixelRatio;
 
     vec2 clamped_pos = clamp(device_pos,
-                             vec2(tile.screen_origin_task_origin.xy),
+                             tile.screen_origin_task_origin.xy,
-                             vec2(tile.screen_origin_task_origin.xy + tile.size_target_index.xy));
+                             tile.screen_origin_task_origin.xy + tile.size_target_index.xy);
 
     vec4 local_clamped_pos = layer.inv_transform * vec4(clamped_pos / uDevicePixelRatio, world_pos.z, 1);
     local_clamped_pos.xyz /= local_clamped_pos.w;
 
-    vec2 final_pos = clamped_pos + vec2(tile.screen_origin_task_origin.zw) - vec2(tile.screen_origin_task_origin.xy);
+    vec2 final_pos = clamped_pos + tile.screen_origin_task_origin.zw - tile.screen_origin_task_origin.xy;
 
     gl_Position = uTransform * vec4(final_pos, 0, 1);
 
@@ -476,24 +487,23 @@ VertexInfo write_vertex(vec4 instance_rect,
     return vi;
 }
 
+#ifdef WR_FEATURE_TRANSFORM
+
 struct TransformVertexInfo {
     vec3 local_pos;
     vec4 clipped_local_rect;
 };
 
 TransformVertexInfo write_transform_vertex(vec4 instance_rect,
-                                           vec4 local_clip_rect,
+                                           vec4 local_clip_rect, //unused
                                            Layer layer,
                                            Tile tile) {
-    vec2 lp0 = instance_rect.xy;
+    vec2 lp0 = clamp(instance_rect.xy,
-    vec2 lp1 = instance_rect.xy + instance_rect.zw;
+                     layer.local_clip_rect.xy,
-
+                     layer.local_clip_rect.xy + layer.local_clip_rect.zw);
-    lp0 = clamp(lp0,
+    vec2 lp1 = clamp(instance_rect.xy + instance_rect.zw,
-                layer.local_clip_rect.xy,
+                     layer.local_clip_rect.xy,
-                layer.local_clip_rect.xy + layer.local_clip_rect.zw);
+                     layer.local_clip_rect.xy + layer.local_clip_rect.zw);
-    lp1 = clamp(lp1,
-                layer.local_clip_rect.xy,
-                layer.local_clip_rect.xy + layer.local_clip_rect.zw);
 
     vec4 clipped_local_rect = vec4(lp0, lp1 - lp0);
 
@@ -512,30 +522,37 @@ TransformVertexInfo write_transform_vertex(vec4 instance_rect,
     vec2 tp2 = t2.xy / t2.w;
     vec2 tp3 = t3.xy / t3.w;
 
-    vec2 min_pos = min(tp0.xy, min(tp1.xy, min(tp2.xy, tp3.xy)));
+    // compute a CSS space aligned bounding box
-    vec2 max_pos = max(tp0.xy, max(tp1.xy, max(tp2.xy, tp3.xy)));
+    vec2 min_pos = min(min(tp0.xy, tp1.xy), min(tp2.xy, tp3.xy));
+    vec2 max_pos = max(max(tp0.xy, tp1.xy), max(tp2.xy, tp3.xy));
 
+    // clamp to the tile boundaries, in device space
     vec2 min_pos_clamped = clamp(min_pos * uDevicePixelRatio,
-                                 vec2(tile.screen_origin_task_origin.xy),
+                                 tile.screen_origin_task_origin.xy,
-                                 vec2(tile.screen_origin_task_origin.xy + tile.size_target_index.xy));
+                                 tile.screen_origin_task_origin.xy + tile.size_target_index.xy);
 
     vec2 max_pos_clamped = clamp(max_pos * uDevicePixelRatio,
-                                 vec2(tile.screen_origin_task_origin.xy),
+                                 tile.screen_origin_task_origin.xy,
-                                 vec2(tile.screen_origin_task_origin.xy + tile.size_target_index.xy));
+                                 tile.screen_origin_task_origin.xy + tile.size_target_index.xy);
 
+    // compute the device space position of this vertex
     vec2 clamped_pos = mix(min_pos_clamped,
                            max_pos_clamped,
                            aPosition.xy);
 
-    vec3 layer_pos = get_layer_pos(clamped_pos / uDevicePixelRatio, layer);
+    // compute the point position in side the layer, in CSS space
+    vec4 layer_pos = get_layer_pos(clamped_pos / uDevicePixelRatio, layer);
 
-    vec2 final_pos = clamped_pos + vec2(tile.screen_origin_task_origin.zw) - vec2(tile.screen_origin_task_origin.xy);
+    // apply the task offset
+    vec2 final_pos = clamped_pos + tile.screen_origin_task_origin.zw - tile.screen_origin_task_origin.xy;
 
     gl_Position = uTransform * vec4(final_pos, 0, 1);
 
-    return TransformVertexInfo(layer_pos, clipped_local_rect);
+    return TransformVertexInfo(layer_pos.xyw, clipped_local_rect);
 }
 
+#endif //WR_FEATURE_TRANSFORM
+
 struct Rectangle {
     vec4 color;
 };

resources/shaders/ps_text.vs.glsl

@@ -10,7 +10,7 @@ void main(void) {
     TransformVertexInfo vi = write_transform_vertex(glyph.info);
     vLocalRect = vi.clipped_local_rect;
     vLocalPos = vi.local_pos;
-    vec2 f = (vi.local_pos.xy - glyph.info.local_rect.xy) / glyph.info.local_rect.zw;
+    vec2 f = (vi.local_pos.xy / vi.local_pos.z - glyph.info.local_rect.xy) / glyph.info.local_rect.zw;
 #else
     VertexInfo vi = write_vertex(glyph.info);
     vec2 f = (vi.local_clamped_pos - vi.local_rect.p0) / (vi.local_rect.p1 - vi.local_rect.p0);

resources/shaders/ps_text_run.vs.glsl

@@ -16,7 +16,7 @@ void main(void) {
                                                     prim.tile);
     vLocalRect = vi.clipped_local_rect;
     vLocalPos = vi.local_pos;
-    vec2 f = (vi.local_pos.xy - prim.local_rect.xy) / prim.local_rect.zw;
+    vec2 f = (vi.local_pos.xy / vi.local_pos.z - local_rect.xy) / local_rect.zw;
 #else
     VertexInfo vi = write_vertex(local_rect,
                                  prim.local_clip_rect,