Bug 1881978 - Support more than 32k render tasks r=gfx-reviewers,lsal…

…zman Differential Revision: https://phabricator.services.mozilla.com/D202676 [ghsync] From https://hg.mozilla.org/mozilla-central/rev/0e1e66c2547f2329cd08d9c81015ec9b9176e853
servo · Feb 27, 2024 · f07d5b7 · f07d5b7
1 parent e66ac32
commit f07d5b7
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 68 deletions.
diff --git a/webrender/res/brush.glsl b/webrender/res/brush.glsl
@@ -214,7 +214,7 @@ void main(void) {
     Instance instance = decode_instance_attributes();
     PrimitiveHeader ph = fetch_prim_header(instance.prim_header_address);
     Transform transform = fetch_transform(ph.transform_id);
-    PictureTask task = fetch_picture_task(instance.picture_task_address);
+    PictureTask task = fetch_picture_task(ph.picture_task_address);
     ClipArea clip_area = fetch_clip_area(instance.clip_address);
 
     WR_VERTEX_SHADER_MAIN_FUNCTION(instance, ph, transform, task, clip_area);

diff --git a/webrender/res/prim_shared.glsl b/webrender/res/prim_shared.glsl
@@ -44,7 +44,6 @@ PER_INSTANCE in ivec4 aData;
 struct Instance
 {
     int prim_header_address;
-    int picture_task_address;
     int clip_address;
     int segment_index;
     int flags;
@@ -56,8 +55,7 @@ Instance decode_instance_attributes() {
     Instance instance;
 
     instance.prim_header_address = aData.x;
-    instance.picture_task_address = aData.y >> 16;
-    instance.clip_address = aData.y & 0xffff;
+    instance.clip_address = aData.y;
     instance.segment_index = aData.z & 0xffff;
     instance.flags = aData.z >> 16;
     instance.resource_address = aData.w & 0xffffff;
@@ -72,6 +70,7 @@ struct PrimitiveHeader {
     float z;
     int specific_prim_address;
     int transform_id;
+    int picture_task_address;
     ivec4 user_data;
 };
 
@@ -90,6 +89,7 @@ PrimitiveHeader fetch_prim_header(int index) {
     ph.z = float(data0.x);
     ph.specific_prim_address = data0.y;
     ph.transform_id = data0.z;
+    ph.picture_task_address = data0.w;
     ph.user_data = data1;
 
     return ph;

diff --git a/webrender/res/ps_text_run.glsl b/webrender/res/ps_text_run.glsl
@@ -100,7 +100,7 @@ void main() {
     PrimitiveHeader ph = fetch_prim_header(instance.prim_header_address);
     Transform transform = fetch_transform(ph.transform_id);
     ClipArea clip_area = fetch_clip_area(instance.clip_address);
-    PictureTask task = fetch_picture_task(instance.picture_task_address);
+    PictureTask task = fetch_picture_task(ph.picture_task_address);
 
     int glyph_index = instance.segment_index;
     int subpx_dir = (instance.flags >> 8) & 0xff;

diff --git a/webrender/res/render_task.glsl b/webrender/res/render_task.glsl
@@ -73,7 +73,7 @@ PictureTask fetch_picture_task(int address) {
     return task;
 }
 
-#define CLIP_TASK_EMPTY 0x7FFF
+#define CLIP_TASK_EMPTY 0x7FFFFFFF
 
 struct ClipArea {
     RectWithEndpoint task_rect;

diff --git a/webrender/src/batch.rs b/webrender/src/batch.rs
diff --git a/webrender/src/gpu_types.rs b/webrender/src/gpu_types.rs
@@ -125,6 +125,7 @@ pub struct SvgFilterInstance {
     pub kind: u16,
     pub input_count: u16,
     pub generic_int: u16,
+    pub padding: u16,
     pub extra_data_address: GpuCacheAddress,
 }
 
@@ -428,6 +429,7 @@ impl PrimitiveHeaders {
         &mut self,
         prim_header: &PrimitiveHeader,
         z: ZBufferId,
+        render_task_address: RenderTaskAddress,
         user_data: [i32; 4],
     ) -> PrimitiveHeaderIndex {
         debug_assert_eq!(self.headers_int.len(), self.headers_float.len());
@@ -440,7 +442,7 @@ impl PrimitiveHeaders {
 
         self.headers_int.push(PrimitiveHeaderI {
             z,
-            unused: 0,
+            render_task_address,
             specific_prim_address: prim_header.specific_prim_address.as_int(),
             transform_id: prim_header.transform_id,
             user_data,
@@ -480,7 +482,7 @@ pub struct PrimitiveHeaderI {
     pub z: ZBufferId,
     pub specific_prim_address: i32,
     pub transform_id: TransformPaletteId,
-    pub unused: i32,                    // To ensure required 16 byte alignment of vertex textures
+    pub render_task_address: RenderTaskAddress,
     pub user_data: [i32; 4],
 }
 
@@ -501,7 +503,6 @@ impl GlyphInstance {
     //           header since they are constant, and some can be
     //           compressed to a smaller size.
     pub fn build(&self,
-        render_task: RenderTaskAddress,
         clip_task: RenderTaskAddress,
         subpx_dir: SubpixelDirection,
         glyph_index_in_text_run: i32,
@@ -511,8 +512,7 @@ impl GlyphInstance {
         PrimitiveInstanceData {
             data: [
                 self.prim_header_index.0 as i32,
-                ((render_task.0 as i32) << 16)
-                | clip_task.0 as i32,
+                clip_task.0 as i32,
                 (subpx_dir as u32 as i32) << 24
                 | (color_mode as u32 as i32) << 16
                 | glyph_index_in_text_run,
@@ -536,7 +536,7 @@ impl From<SplitCompositeInstance> for PrimitiveInstanceData {
                 instance.prim_header_index.0,
                 instance.polygons_address,
                 instance.z.0,
-                instance.render_task_address.0 as i32,
+                instance.render_task_address.0,
             ],
         }
     }
@@ -576,7 +576,7 @@ impl From<QuadInstance> for PrimitiveInstanceData {
                 ((instance.part_index as i32)    <<  8) |
                 ((instance.segment_index as i32) <<  0),
 
-                instance.render_task_address.0 as i32,
+                instance.render_task_address.0,
             ],
         }
     }
@@ -664,7 +664,6 @@ impl core::fmt::Debug for BrushFlags {
 /// Convenience structure to encode into PrimitiveInstanceData.
 pub struct BrushInstance {
     pub prim_header_index: PrimitiveHeaderIndex,
-    pub render_task_address: RenderTaskAddress,
     pub clip_task_address: RenderTaskAddress,
     pub segment_index: i32,
     pub edge_flags: EdgeAaSegmentMask,
@@ -677,8 +676,7 @@ impl From<BrushInstance> for PrimitiveInstanceData {
         PrimitiveInstanceData {
             data: [
                 instance.prim_header_index.0,
-                ((instance.render_task_address.0 as i32) << 16)
-                | instance.clip_task_address.0 as i32,
+                instance.clip_task_address.0,
                 instance.segment_index
                 | ((instance.brush_flags.bits() as i32) << 16)
                 | ((instance.edge_flags.bits() as i32) << 28),

diff --git a/webrender/src/render_target.rs b/webrender/src/render_target.rs
@@ -925,6 +925,7 @@ fn add_svg_filter_instances(
         kind,
         input_count,
         generic_int,
+        padding: 0,
         extra_data_address: extra_data_address.unwrap_or(GpuCacheAddress::INVALID),
     };
 

diff --git a/webrender/src/render_task.rs b/webrender/src/render_task.rs
@@ -46,11 +46,11 @@ fn render_task_sanity_check(size: &DeviceIntSize) {
 #[repr(C)]
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct RenderTaskAddress(pub u16);
+pub struct RenderTaskAddress(pub i32);
 
 impl Into<RenderTaskAddress> for RenderTaskId {
     fn into(self) -> RenderTaskAddress {
-        RenderTaskAddress(self.index as u16)
+        RenderTaskAddress(self.index as i32)
     }
 }
 

diff --git a/webrender/src/renderer/vertex.rs b/webrender/src/renderer/vertex.rs
@@ -49,12 +49,12 @@ pub mod desc {
             VertexAttribute {
                 name: "aBlurRenderTaskAddress",
                 count: 1,
-                kind: VertexAttributeKind::U16,
+                kind: VertexAttributeKind::I32,
             },
             VertexAttribute {
                 name: "aBlurSourceTaskAddress",
                 count: 1,
-                kind: VertexAttributeKind::U16,
+                kind: VertexAttributeKind::I32,
             },
             VertexAttribute {
                 name: "aBlurDirection",
@@ -574,17 +574,17 @@ pub mod desc {
             VertexAttribute {
                 name: "aFilterRenderTaskAddress",
                 count: 1,
-                kind: VertexAttributeKind::U16,
+                kind: VertexAttributeKind::I32,
             },
             VertexAttribute {
                 name: "aFilterInput1TaskAddress",
                 count: 1,
-                kind: VertexAttributeKind::U16,
+                kind: VertexAttributeKind::I32,
             },
             VertexAttribute {
                 name: "aFilterInput2TaskAddress",
                 count: 1,
-                kind: VertexAttributeKind::U16,
+                kind: VertexAttributeKind::I32,
             },
             VertexAttribute {
                 name: "aFilterKind",
@@ -601,6 +601,11 @@ pub mod desc {
                 count: 1,
                 kind: VertexAttributeKind::U16,
             },
+            VertexAttribute {
+                name: "aUnused",
+                count: 1,
+                kind: VertexAttributeKind::U16,
+            },
             VertexAttribute {
                 name: "aFilterExtraDataAddress",
                 count: 2,