From 09320048f8f61fffa374305aaaf3a9a0bb0e507a Mon Sep 17 00:00:00 2001 From: David Chavez Date: Mon, 3 Jul 2023 15:34:52 +0200 Subject: [PATCH] Update to handle new hashing --- src/gui/gui_glium.rs | 9 +++------ src/gui/gui_wgpu.rs | 7 ++----- src/gui/windows.rs | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/gui/gui_glium.rs b/src/gui/gui_glium.rs index e60b7cf..b8e4b9e 100644 --- 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 index c76b163..961d52c 100644 --- 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 index 2a35fee..badf1a3 100644 --- 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) )); });