Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-13 17:35:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update WR + shaders (switch to untyped UBO for CI).

Browse source
This commit is contained in:
Glenn Watson 2016-09-01 11:44:26 +10:00
parent bbfe38e35f
commit 31d055dced
18 changed files with 375 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

29
resources/shaders/ps_text_run.vs.glsl
View file

@ -3,34 +3,17 @@
* 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/. */
struct TextRunGlyph {
vec4 local_rect;
vec4 uv_rect;
};
struct TextRun {
PrimitiveInfo info;
TextRunGlyph glyphs[WR_GLYPHS_PER_TEXT_RUN];
vec4 color;
};
layout(std140) uniform Items {
TextRun text_runs[WR_MAX_PRIM_ITEMS];
};
void main(void) {
TextRun text_run = text_runs[gl_InstanceID / WR_GLYPHS_PER_TEXT_RUN];
TextRunGlyph glyph = text_run.glyphs[gl_InstanceID % WR_GLYPHS_PER_TEXT_RUN];
text_run.info.local_rect = glyph.local_rect;
vec4 uv_rect = glyph.uv_rect;
vec4 color, uv_rect;
PrimitiveInfo info = fetch_text_run_glyph(gl_InstanceID, color, uv_rect);
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(text_run.info);
TransformVertexInfo vi = write_transform_vertex(info);
vLocalRect = vi.clipped_local_rect;
vLocalPos = vi.local_pos;
vec2 f = (vi.local_pos.xy - text_run.info.local_rect.xy) / text_run.info.local_rect.zw;
vec2 f = (vi.local_pos.xy - info.local_rect.xy) / info.local_rect.zw;
#else
VertexInfo vi = write_vertex(text_run.info);
VertexInfo vi = write_vertex(info);
vec2 f = (vi.local_clamped_pos - vi.local_rect.p0) / (vi.local_rect.p1 - vi.local_rect.p0);
#endif
@ -38,6 +21,6 @@ void main(void) {
vec2 st0 = uv_rect.xy / texture_size;
vec2 st1 = uv_rect.zw / texture_size;
vColor = text_run.color;
vColor = color;
vUv = mix(st0, st1, f);
}