From be8d67d0b0a2438a9a305c941e9ec02aeb5e9fc7 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Fri, 9 Jul 2021 15:45:55 -0700 Subject: [PATCH] switch sprites back to wgsl shader --- pipelined/bevy_sprite2/src/render/mod.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pipelined/bevy_sprite2/src/render/mod.rs b/pipelined/bevy_sprite2/src/render/mod.rs index 938518c59c2f3..9f55cca8afa27 100644 --- a/pipelined/bevy_sprite2/src/render/mod.rs +++ b/pipelined/bevy_sprite2/src/render/mod.rs @@ -28,10 +28,8 @@ pub struct SpriteShaders { impl FromWorld for SpriteShaders { fn from_world(world: &mut World) -> Self { let render_device = world.get_resource::().unwrap(); - let shader_vert = Shader::from_glsl(include_str!("sprite.vert")); - let shader_frag = Shader::from_glsl(include_str!("sprite.frag")); - let shader_module_vert = render_device.create_shader_module(&shader_vert); - let shader_module_frag = render_device.create_shader_module(&shader_frag); + let shader = Shader::from_wgsl(include_str!("sprite.wgsl")); + let shader_module = render_device.create_shader_module(&shader); let view_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor { entries: &[BindGroupLayoutEntry { @@ -98,11 +96,11 @@ impl FromWorld for SpriteShaders { }, ], }], - module: &shader_module_vert, + module: &shader_module, entry_point: "vertex", }, fragment: Some(FragmentState { - module: &shader_module_frag, + module: &shader_module, entry_point: "fragment", targets: &[ColorTargetState { format: TextureFormat::bevy_default(),