Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - load spirv using correct API #3466

Closed
wants to merge 3 commits into from
Closed

[Merged by Bors] - load spirv using correct API #3466

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
683458b
load spirv using correct API
molikto Dec 29, 2021
bd530f9
fix: format
molikto Dec 29, 2021
8fdcb6a
fix: import
molikto Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions crates/bevy_render/src/render_resource/shader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use naga::back::wgsl::WriterFlags;
use naga::{valid::ModuleInfo, Module};
use once_cell::sync::Lazy;
use regex::Regex;
use wgpu::util::make_spirv;
use std::{
borrow::Cow, collections::HashSet, marker::Copy, ops::Deref, path::PathBuf, str::FromStr,
};
Expand Down Expand Up @@ -172,11 +173,8 @@ impl ProcessedShader {
let wgsl = reflection.get_wgsl()?;
ShaderSource::Wgsl(wgsl.into())
}
ProcessedShader::SpirV(_) => {
// 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))
ProcessedShader::SpirV(source) => {
make_spirv(source)
}
},
})
Expand Down