Update WebRender to get the latest changes

This commit is contained in:
Martin Robinson 2016-10-23 13:20:36 +02:00
parent 8a12c15582
commit 0a13c05479
20 changed files with 650 additions and 445 deletions

View file

@ -3,34 +3,70 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#define DIR_HORIZONTAL uint(0)
#define DIR_VERTICAL uint(1)
void main(void) {
AlignedGradient gradient = fetch_aligned_gradient(gl_InstanceID);
Primitive prim = load_primitive(gl_InstanceID);
Gradient gradient = fetch_gradient(prim.prim_index);
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(gradient.info);
vLocalRect = vi.clipped_local_rect;
vLocalPos = vi.local_pos;
vec2 f = (vi.local_pos.xy - gradient.info.local_rect.xy) / gradient.info.local_rect.zw;
#else
VertexInfo vi = write_vertex(gradient.info);
vec2 f = (vi.local_clamped_pos - gradient.info.local_rect.xy) / gradient.info.local_rect.zw;
vPos = vi.local_clamped_pos;
#endif
int stop_index = prim.user_data.x + prim.user_data.y;
GradientStop g0 = fetch_gradient_stop(stop_index + 0);
GradientStop g1 = fetch_gradient_stop(stop_index + 1);
switch (uint(gradient.dir.x)) {
case DIR_HORIZONTAL:
vF = f.x;
vec4 segment_rect;
switch (int(gradient.kind.x)) {
case GRADIENT_HORIZONTAL:
float x0 = mix(gradient.start_end_point.x,
gradient.start_end_point.z,
g0.offset.x);
float x1 = mix(gradient.start_end_point.x,
gradient.start_end_point.z,
g1.offset.x);
segment_rect.yw = prim.local_rect.yw;
segment_rect.x = x0;
segment_rect.z = x1 - x0;
break;
case DIR_VERTICAL:
vF = f.y;
case GRADIENT_VERTICAL:
float y0 = mix(gradient.start_end_point.y,
gradient.start_end_point.w,
g0.offset.x);
float y1 = mix(gradient.start_end_point.y,
gradient.start_end_point.w,
g1.offset.x);
segment_rect.xz = prim.local_rect.xz;
segment_rect.y = y0;
segment_rect.w = y1 - y0;
break;
}
write_clip(gradient.clip);
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(segment_rect,
prim.local_clip_rect,
prim.layer,
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;
#else
VertexInfo vi = write_vertex(segment_rect,
prim.local_clip_rect,
prim.layer,
prim.tile);
vColor0 = gradient.color0;
vColor1 = gradient.color1;
vec2 f = (vi.local_clamped_pos - segment_rect.xy) / segment_rect.zw;
vPos = vi.local_clamped_pos;
#endif
switch (int(gradient.kind.x)) {
case GRADIENT_HORIZONTAL:
vColor = mix(g0.color, g1.color, f.x);
break;
case GRADIENT_VERTICAL:
vColor = mix(g0.color, g1.color, f.y);
break;
case GRADIENT_ROTATED:
vColor = vec4(1.0, 0.0, 1.0, 1.0);
break;
}
Clip clip = fetch_clip(prim.clip_index);
write_clip(clip);
}