Skip to content

Commit 6440dff

Browse files
author
bors-servo
authored
Auto merge of #1835 - glennw:tidy-hw, r=emilio
Move hardware composite shader to a single file, to match others. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1835) <!-- Reviewable:end -->
2 parents 16251d8 + 26ab505 commit 6440dff

File tree

3 files changed

+31
-33
lines changed

3 files changed

+31
-33
lines changed

webrender/res/ps_hardware_composite.fs.glsl

Lines changed: 0 additions & 8 deletions
This file was deleted.

webrender/res/ps_hardware_composite.glsl

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,34 @@
66

77
varying vec3 vUv;
88
flat varying vec4 vUvBounds;
9+
10+
#ifdef WR_VERTEX_SHADER
11+
void main(void) {
12+
CompositeInstance ci = fetch_composite_instance();
13+
AlphaBatchTask dest_task = fetch_alpha_batch_task(ci.render_task_index);
14+
AlphaBatchTask src_task = fetch_alpha_batch_task(ci.src_task_index);
15+
16+
vec2 dest_origin = dest_task.render_target_origin -
17+
dest_task.screen_space_origin +
18+
vec2(ci.user_data0, ci.user_data1);
19+
20+
vec2 local_pos = mix(dest_origin,
21+
dest_origin + src_task.size,
22+
aPosition.xy);
23+
24+
vec2 texture_size = vec2(textureSize(sCacheRGBA8, 0));
25+
vec2 st0 = src_task.render_target_origin;
26+
vec2 st1 = src_task.render_target_origin + src_task.size;
27+
vUv = vec3(mix(st0, st1, aPosition.xy) / texture_size, src_task.render_target_layer_index);
28+
vUvBounds = vec4(st0 + 0.5, st1 - 0.5) / texture_size.xyxy;
29+
30+
gl_Position = uTransform * vec4(local_pos, ci.z, 1.0);
31+
}
32+
#endif
33+
34+
#ifdef WR_FRAGMENT_SHADER
35+
void main(void) {
36+
vec2 uv = clamp(vUv.xy, vUvBounds.xy, vUvBounds.zw);
37+
oFragColor = texture(sCacheRGBA8, vec3(uv, vUv.z));
38+
}
39+
#endif

webrender/res/ps_hardware_composite.vs.glsl

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)