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

load spirv using correct API (#3466)

Browse Source 
# Objective

currently spirv source loading parse then desterilize it to make wgpu happy.

## Solution

Use the right API to get spirv
This commit is contained in:
Minghao Liu 2021-12-30 19:55:01 +00:00
parent b532cc9ef6
commit 3ac55f0bcf
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_render/src/render_resource/shader.rs
View File

@ -9,7 +9,7 @@ use std::{
borrow::Cow, collections::HashSet, marker::Copy, ops::Deref, path::PathBuf, str::FromStr, borrow::Cow, collections::HashSet, marker::Copy, ops::Deref, path::PathBuf, str::FromStr,
}; };
use thiserror::Error; use thiserror::Error;
use wgpu::{ShaderModuleDescriptor, ShaderSource}; use wgpu::{util::make_spirv, ShaderModuleDescriptor, ShaderSource};
#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)] #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
pub struct ShaderId(Uuid); pub struct ShaderId(Uuid);
@ -172,12 +172,7 @@ impl ProcessedShader {
let wgsl = reflection.get_wgsl()?; let wgsl = reflection.get_wgsl()?;
ShaderSource::Wgsl(wgsl.into()) ShaderSource::Wgsl(wgsl.into())
} }
ProcessedShader::SpirV(_) => { ProcessedShader::SpirV(source) => make_spirv(source),
// TODO: we can probably just transmute the u8 array to u32?
let reflection = self.reflect()?;
let spirv = reflection.get_spirv()?;
ShaderSource::SpirV(Cow::Owned(spirv))
}
}, },
}) })
} }