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

[Merged by Bors] - support all line endings in shader preprocessor #3603

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - support all line endings in shader preprocessor #3603

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcf2556
support all line endings
mockersf Jan 9, 2022
4b834c6
do not remove the last line ending
mockersf Jan 9, 2022
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
5 changes: 2 additions & 3 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 @@ -308,7 +308,7 @@ impl ShaderImportProcessor {

pub fn get_imports_from_str(&self, shader: &str) -> Vec<ShaderImport> {
let mut imports = Vec::new();
for line in shader.split('\n') {
for line in shader.lines() {
if let Some(cap) = self.import_asset_path_regex.captures(line) {
let import = cap.get(1).unwrap();
imports.push(ShaderImport::AssetPath(import.as_str().to_string()));
Expand Down Expand Up @@ -366,7 +366,7 @@ impl ShaderProcessor {
let shader_defs_unique = HashSet::<String>::from_iter(shader_defs.iter().cloned());
let mut scopes = vec![true];
let mut final_string = String::new();
for line in shader_str.split('\n') {
for line in shader_str.lines() {
if let Some(cap) = self.ifdef_regex.captures(line) {
let def = cap.get(1).unwrap();
scopes.push(*scopes.last().unwrap() && shader_defs_unique.contains(def.as_str()));
Expand Down Expand Up @@ -417,7 +417,6 @@ impl ShaderProcessor {
final_string.push('\n');
}
}
final_string.pop();

if scopes.len() != 1 {
return Err(ProcessShaderError::NotEnoughEndIfs);
Expand Down