forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch sprites back to wgsl shader

Browse Source
This commit is contained in:
Carter Anderson 2021-07-09 15:45:55 -07:00
parent e0205019ef
commit be8d67d0b0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pipelined/bevy_sprite2/src/render/mod.rs
View File

@ -28,10 +28,8 @@ pub struct SpriteShaders {
impl FromWorld for SpriteShaders { impl FromWorld for SpriteShaders {
fn from_world(world: &mut World) -> Self { fn from_world(world: &mut World) -> Self {
let render_device = world.get_resource::<RenderDevice>().unwrap(); let render_device = world.get_resource::<RenderDevice>().unwrap();
let shader_vert = Shader::from_glsl(include_str!("sprite.vert")); let shader = Shader::from_wgsl(include_str!("sprite.wgsl"));
let shader_frag = Shader::from_glsl(include_str!("sprite.frag")); let shader_module = render_device.create_shader_module(&shader);
let shader_module_vert = render_device.create_shader_module(&shader_vert);
let shader_module_frag = render_device.create_shader_module(&shader_frag);
let view_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor { let view_layout = render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
entries: &[BindGroupLayoutEntry { entries: &[BindGroupLayoutEntry {
@ -98,11 +96,11 @@ impl FromWorld for SpriteShaders {
}, },
], ],
}], }],
module: &shader_module_vert, module: &shader_module,
entry_point: "vertex", entry_point: "vertex",
}, },
fragment: Some(FragmentState { fragment: Some(FragmentState {
module: &shader_module_frag, module: &shader_module,
entry_point: "fragment", entry_point: "fragment",
targets: &[ColorTargetState { targets: &[ColorTargetState {
format: TextureFormat::bevy_default(), format: TextureFormat::bevy_default(),