From aaef5577cdbb5f7256d177be5fc98b0965d67753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois?= <mockersf@gmail.com>
Date: Tue, 7 Nov 2023 10:51:40 +0100
Subject: [PATCH] UI Material: each material should have its own buffer
 (#10422)

# Objective

- When having several UI Material, nodes are not correctly placed

## Solution

- have a buffer per material
---
 crates/bevy_ui/src/render/ui_material_pipeline.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_ui/src/render/ui_material_pipeline.rs b/crates/bevy_ui/src/render/ui_material_pipeline.rs
index 53d17fb6b0d00..ca1ae21bf5ab9 100644
--- a/crates/bevy_ui/src/render/ui_material_pipeline.rs
+++ b/crates/bevy_ui/src/render/ui_material_pipeline.rs
@@ -70,7 +70,7 @@ where
                 .init_resource::<ExtractedUiMaterials<M>>()
                 .init_resource::<ExtractedUiMaterialNodes<M>>()
                 .init_resource::<RenderUiMaterials<M>>()
-                .init_resource::<UiMaterialMeta>()
+                .init_resource::<UiMaterialMeta<M>>()
                 .init_resource::<SpecializedRenderPipelines<UiMaterialPipeline<M>>>()
                 .add_systems(
                     ExtractSchedule,
@@ -98,16 +98,18 @@ where
 }
 
 #[derive(Resource)]
-pub struct UiMaterialMeta {
+pub struct UiMaterialMeta<M: UiMaterial> {
     vertices: BufferVec<UiMaterialVertex>,
     view_bind_group: Option<BindGroup>,
+    marker: PhantomData<M>,
 }
 
-impl Default for UiMaterialMeta {
+impl<M: UiMaterial> Default for UiMaterialMeta<M> {
     fn default() -> Self {
         Self {
             vertices: BufferVec::new(BufferUsages::VERTEX),
             view_bind_group: Default::default(),
+            marker: PhantomData,
         }
     }
 }
@@ -261,7 +263,7 @@ pub type DrawUiMaterial<M> = (
 
 pub struct SetMatUiViewBindGroup<M: UiMaterial, const I: usize>(PhantomData<M>);
 impl<P: PhaseItem, M: UiMaterial, const I: usize> RenderCommand<P> for SetMatUiViewBindGroup<M, I> {
-    type Param = SRes<UiMaterialMeta>;
+    type Param = SRes<UiMaterialMeta<M>>;
     type ViewWorldQuery = Read<ViewUniformOffset>;
     type ItemWorldQuery = ();
 
@@ -307,7 +309,7 @@ impl<P: PhaseItem, M: UiMaterial, const I: usize> RenderCommand<P>
 
 pub struct DrawUiMaterialNode<M>(PhantomData<M>);
 impl<P: PhaseItem, M: UiMaterial> RenderCommand<P> for DrawUiMaterialNode<M> {
-    type Param = SRes<UiMaterialMeta>;
+    type Param = SRes<UiMaterialMeta<M>>;
     type ViewWorldQuery = ();
     type ItemWorldQuery = Read<UiMaterialBatch<M>>;
 
@@ -429,7 +431,7 @@ pub fn prepare_uimaterial_nodes<M: UiMaterial>(
     mut commands: Commands,
     render_device: Res<RenderDevice>,
     render_queue: Res<RenderQueue>,
-    mut ui_meta: ResMut<UiMaterialMeta>,
+    mut ui_meta: ResMut<UiMaterialMeta<M>>,
     mut extracted_uinodes: ResMut<ExtractedUiMaterialNodes<M>>,
     view_uniforms: Res<ViewUniforms>,
     ui_material_pipeline: Res<UiMaterialPipeline<M>>,