Update to handle new hashing

retrofoundry · Jul 3, 2023 · 0932004 · 0932004
1 parent 6e1c95c
commit 0932004
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/gui/gui_glium.rs b/src/gui/gui_glium.rs
@@ -265,13 +265,10 @@ impl<'a> Gui<'a> {
             self.graphics_device.set_viewport(&draw_call.viewport);
             self.graphics_device.set_scissor(draw_call.scissor);
 
-            self.graphics_device.load_program(
+            self.graphics_device.select_program(
                 &self.display,
-                draw_call.shader_hash,
-                draw_call.other_mode_h,
-                draw_call.other_mode_l,
-                draw_call.geometry_mode,
-                draw_call.combine,
+                draw_call.shader_id,
+                draw_call.shader_config,
             );
 
             // loop through textures and bind them

diff --git a/src/gui/gui_wgpu.rs b/src/gui/gui_wgpu.rs
@@ -349,11 +349,8 @@ impl<'a> Gui<'a> {
 
                 self.graphics_device.select_program(
                     &self.device,
-                    draw_call.shader_hash,
-                    draw_call.other_mode_h,
-                    draw_call.other_mode_l,
-                    draw_call.geometry_mode,
-                    draw_call.combine,
+                    draw_call.shader_id,
+                    draw_call.shader_config,
                 );
 
                 // loop through textures and bind them

diff --git a/src/gui/windows.rs b/src/gui/windows.rs
@@ -57,11 +57,11 @@ impl HelixWindows for Ui {
                                 self.tree_node_config("Geometry Mode").build(|| {
                                     self.text(format!(
                                         "Lighting: {}",
-                                        geometry_mode_uses_lighting(dc.geometry_mode)
+                                        geometry_mode_uses_lighting(dc.shader_config.geometry_mode)
                                     ));
                                     self.text(format!(
                                         "Fog: {}",
-                                        geometry_mode_uses_fog(dc.geometry_mode)
+                                        geometry_mode_uses_fog(dc.shader_config.geometry_mode)
                                     ));
                                 });