From a57832bc9a7bc815dc92b905df5b9130ddec0e7c Mon Sep 17 00:00:00 2001
From: Talin <viridia@gmail.com>
Date: Tue, 6 Feb 2024 08:15:09 -0800
Subject: [PATCH] Include UI node size in the vertex inputs for UiMaterial.
 (#11722)

# Objective

Includes the UI node size as a parameter to the UiMaterial shader,
useful for SDF-based rendering, aspect ratio correction and other use
cases.

Fixes #11392

## Solution

Added the node size to the UiMaterial vertex shader params and also to
the data that is passed to the fragment shader.

## Migration Guide

This change should be backwards compatible, using the new field is
optional.

Note to reviewers: render pipelines are a bit outside my comfort zone,
so please make sure I haven't made any mistakes.

---------

Co-authored-by: Rob Parrett <robparrett@gmail.com>
---
 crates/bevy_ui/src/render/ui_material.wgsl        | 4 +++-
 crates/bevy_ui/src/render/ui_material_pipeline.rs | 4 ++++
 crates/bevy_ui/src/render/ui_vertex_output.wgsl   | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_ui/src/render/ui_material.wgsl b/crates/bevy_ui/src/render/ui_material.wgsl
index 14f6b3e816..575df198ae 100644
--- a/crates/bevy_ui/src/render/ui_material.wgsl
+++ b/crates/bevy_ui/src/render/ui_material.wgsl
@@ -13,11 +13,13 @@ var<uniform> globals: Globals;
 fn vertex(
     @location(0) vertex_position: vec3<f32>,
     @location(1) vertex_uv: vec2<f32>,
-    @location(2) border_widths: vec4<f32>,
+    @location(2) size: vec2<f32>,
+    @location(3) border_widths: vec4<f32>,
 ) -> UiVertexOutput {
     var out: UiVertexOutput;
     out.uv = vertex_uv;
     out.position = view.view_proj * vec4<f32>(vertex_position, 1.0);
+    out.size = size;
     out.border_widths = border_widths;
     return out;
 }
diff --git a/crates/bevy_ui/src/render/ui_material_pipeline.rs b/crates/bevy_ui/src/render/ui_material_pipeline.rs
index 2900560a6d..1afead26ce 100644
--- a/crates/bevy_ui/src/render/ui_material_pipeline.rs
+++ b/crates/bevy_ui/src/render/ui_material_pipeline.rs
@@ -120,6 +120,7 @@ impl<M: UiMaterial> Default for UiMaterialMeta<M> {
 pub struct UiMaterialVertex {
     pub position: [f32; 3],
     pub uv: [f32; 2],
+    pub size: [f32; 2],
     pub border_widths: [f32; 4],
 }
 
@@ -156,6 +157,8 @@ where
                 VertexFormat::Float32x3,
                 // uv
                 VertexFormat::Float32x2,
+                // size
+                VertexFormat::Float32x2,
                 // border_widths
                 VertexFormat::Float32x4,
             ],
@@ -558,6 +561,7 @@ pub fn prepare_uimaterial_nodes<M: UiMaterial>(
                         ui_meta.vertices.push(UiMaterialVertex {
                             position: positions_clipped[i].into(),
                             uv: uvs[i].into(),
+                            size: extracted_uinode.rect.size().into(),
                             border_widths: extracted_uinode.border,
                         });
                     }
diff --git a/crates/bevy_ui/src/render/ui_vertex_output.wgsl b/crates/bevy_ui/src/render/ui_vertex_output.wgsl
index de41c52819..1bb77a83dc 100644
--- a/crates/bevy_ui/src/render/ui_vertex_output.wgsl
+++ b/crates/bevy_ui/src/render/ui_vertex_output.wgsl
@@ -5,5 +5,7 @@ struct UiVertexOutput {
     @location(0) uv: vec2<f32>,
     // The size of the borders in UV space. Order is Left, Right, Top, Bottom.
     @location(1) border_widths: vec4<f32>,
+    // The size of the node in pixels. Order is width, height.
+    @location(2) @interpolate(flat) size: vec2<f32>,
     @builtin(position) position: vec4<f32>,
 };