Bug 1594091 - Move user_data to the glyph instance w field. r=gw

First patch in of series that will rearrange the layout of the glyph instance attributes so that it matches brush instances.
This will be needed to add a unified shader that can render the most common alpha pass primitives, including text.

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

--HG--
extra : moz-landing-system : lando

gfx/wr/webrender/res/ps_text_run.glsl

@@ -177,10 +177,10 @@ void main(void) {
     int prim_header_address = aData.x;
     int glyph_index = aData.y & 0xffff;
     int render_task_index = aData.y >> 16;
-    int resource_address = aData.z;
-    int raster_space = aData.w >> 16;
-    int subpx_dir = (aData.w >> 8) & 0xff;
-    int color_mode = aData.w & 0xff;
+    int raster_space = aData.z >> 16;
+    int subpx_dir = (aData.z >> 8) & 0xff;
+    int color_mode = aData.z & 0xff;
+    int resource_address = aData.w;
 
     PrimitiveHeader ph = fetch_prim_header(prim_header_address);
     Transform transform = fetch_transform(ph.transform_id);

gfx/wr/webrender/src/batch.rs

@@ -980,10 +980,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) << 16
+                                        | (subpx_dir as u32 as i32) << 8
+                                        | (color_mode as u32 as i32),
                                         glyph.uv_rect_address.as_int(),
-                                        (rasterization_space as i32) << 16 |
-                                        (subpx_dir as u32 as i32) << 8 |
-                                        (color_mode as u32 as i32),
                                     ));
                                 }
                             }