Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1594091 - Move glyph_index to the second half of the glyph instance z field. r=gw

Browse Source 
Depends on D51880

Differential Revision: https://phabricator.services.mozilla.com/D51882

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Nicolas Silva 2019-11-05 19:05:25 +00:00
parent d647d338f9
commit 04523447d2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/wr/webrender/res/ps_text_run.glsl
View File

@ -175,9 +175,9 @@ VertexInfo write_text_vertex(RectWithSize local_clip_rect,
void main(void) {
int prim_header_address = aData.x;
int glyph_index = aData.y & 0xffff;
int render_task_index = aData.y >> 16;
int raster_space = aData.z & 0xffff;
int raster_space = aData.y & 0xffff;
int glyph_index = aData.z & 0xffff;
int subpx_dir = (aData.z >> 24) & 0xff;
int color_mode = (aData.z >> 16) & 0xff;
int resource_address = aData.w;

4
gfx/wr/webrender/src/batch.rs
View File

@ -979,10 +979,10 @@ impl BatchBuilder {
for glyph in glyphs {
batch.push(base_instance.build(
glyph.index_in_text_run | ((render_task_address.0 as i32) << 16),
(rasterization_space as i32) | ((render_task_address.0 as i32) << 16),
(subpx_dir as u32 as i32) << 24
| (color_mode as u32 as i32) << 16
| (rasterization_space as i32),
| glyph.index_in_text_run,
glyph.uv_rect_address.as_int(),
));
}