Remove the local rect from plane splitting GPU data

KennanChan · Oct 16, 2018 · 7dd4494 · 7dd4494
1 parent 9eda2df
commit 7dd4494
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,8 +16,12 @@ wrench/ron_frames
 *.iws
 *.iml
 
-#Gradle
+# Gradle
 .gradle
 
 # VSCode
 .vscode
+.vs
+
+# System
+.fuse_hidden*
diff --git a/webrender/res/ps_split_composite.glsl b/webrender/res/ps_split_composite.glsl
@@ -10,15 +10,13 @@ flat varying vec4 vUvSampleBounds;
 #ifdef WR_VERTEX_SHADER
 struct SplitGeometry {
     vec2 local[4];
-    RectWithSize local_rect;
 };
 
 SplitGeometry fetch_split_geometry(int address) {
     ivec2 uv = get_gpu_cache_uv(address);
 
     vec4 data0 = TEXEL_FETCH(sGpuCache, uv, 0, ivec2(0, 0));
     vec4 data1 = TEXEL_FETCH(sGpuCache, uv, 0, ivec2(1, 0));
-    vec4 data2 = TEXEL_FETCH(sGpuCache, uv, 0, ivec2(2, 0));
 
     SplitGeometry geo;
     geo.local = vec2[4](
@@ -27,7 +25,6 @@ SplitGeometry fetch_split_geometry(int address) {
         data1.xy,
         data1.zw
     );
-    geo.local_rect = RectWithSize(data2.xy, data2.zw);
 
     return geo;
 }
@@ -98,7 +95,7 @@ void main(void) {
         max_uv - vec2(0.5)
     ) / texture_size.xyxy;
 
-    vec2 f = (local_pos - geometry.local_rect.p0) / geometry.local_rect.size;
+    vec2 f = (local_pos - ph.local_rect.p0) / ph.local_rect.size;
 
     f = bilerp(
         extra_data.st_tl, extra_data.st_tr,

diff --git a/webrender/src/batch.rs b/webrender/src/batch.rs
@@ -551,7 +551,6 @@ impl AlphaBatchBuilder {
             let gpu_blocks = [
                 [local_points[0].x, local_points[0].y, local_points[1].x, local_points[1].y].into(),
                 [local_points[2].x, local_points[2].y, local_points[3].x, local_points[3].y].into(),
-                pic_metadata.local_rect.into(),
             ];
 
             let gpu_handle = gpu_cache.push_per_frame_blocks(&gpu_blocks);