finished moving out render_state

core/src/render/mod.rs

@@ -1,7 +1,7 @@
 use std::num::NonZero;
 
 use crate::{
-    Textures, UiRenderState,
+    UiData, UiRenderState,
     render::{data::PrimitiveInstance, texture::GpuTextures, util::ArrBuf},
     util::HashMap,
 };
@@ -63,14 +63,14 @@ impl UiRenderNode {
         &mut self,
         device: &Device,
         queue: &Queue,
-        ui: &mut UiRenderState,
-        textures: &mut Textures,
+        ui: &mut UiData,
+        ui_render: &mut UiRenderState,
     ) {
         self.active.clear();
-        for (i, primitives) in ui.layers.iter_mut() {
+        for (i, primitives) in ui_render.layers.iter_mut() {
             self.active.push(i);
             for change in primitives.apply_free() {
-                if let Some(inst) = ui.active.get_mut(&change.id) {
+                if let Some(inst) = ui_render.active.get_mut(&change.id) {
                     for h in &mut inst.primitives {
                         if h.layer == i && h.inst_idx == change.old {
                             h.inst_idx = change.new;
@@ -107,7 +107,7 @@ impl UiRenderNode {
             }
         }
         let mut changed = false;
-        changed |= self.textures.update(textures);
+        changed |= self.textures.update(&mut ui.textures);
         if ui.masks.changed {
             ui.masks.changed = false;
             self.masks.update(device, queue, &ui.masks[..]);