Skip to content

Commit

Permalink
Fix shader transpiling error. Update dependencies
Browse files Browse the repository at this point in the history
This update fixes the transpilation of preprocessor directives when
interspersed with other external declarations. Thanks Esron#1571 for
reporting this issue over Discord.

Related glsl fork commits:
ComunidadAylas/glsl@6326adf
ComunidadAylas/glsl@fabd76d
  • Loading branch information
AlexTMjugador committed Oct 9, 2021
1 parent d409281 commit a188fab
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 22 deletions.
35 changes: 18 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Expand Up @@ -16,7 +16,7 @@ bytes = "1.1.0"
globset = "0.4.8"
enumset = { version = "1.0.7", features = ["serde"] }
indexmap = { version = "1.7.0", default-features = false, features = ["serde-1"] }
thiserror = "1.0.29"
thiserror = "1.0.30"
ahash = "0.7.4"

num_cpus = "1.13.0"
Expand All @@ -38,7 +38,7 @@ json_comments = "0.2.0"
jsonpath_lib = "0.3.0"

spng = { version = "0.2.0-alpha.2", default-features = false }
png = "0.17.1"
png = "0.17.2"
rgb = "0.8.27"
imagequant = "3.1.0"
oxipng = { version = "5.0.0", default-features = false, features = ["zopfli"] }
Expand Down
7 changes: 4 additions & 3 deletions src/main.rs
Expand Up @@ -84,9 +84,10 @@ fn read_options_file_and_process(options_file_path: Option<&String>) -> i32 {
// Newbies are often confused by terms such as "standard input", so try
// to point them in the direction of what they probably want to do
println!(
"If you are not sure what this means, try using an external options \
file with PackSquash. Please check out <https://packsquash.page.link/Options-files> \
for examples and more information."
"If you are not sure what this means, try using an external options file with PackSquash."
);
println!(
"Please check out <https://packsquash.page.link/Options-files> for examples and more information."
);
}
println!();
Expand Down
3 changes: 3 additions & 0 deletions src/pack_file/shader_file/example.fsh
Expand Up @@ -4,6 +4,9 @@

#version 120

// Dummy variable added to check that transpilation doesn't mess with the preprocessor directives
vec3 dummy_variable;

// Test that the #moj_import directive added in 1.17 works fine
#moj_import <base.fsh>
#moj_import "common.fsh"
Expand Down

0 comments on commit a188fab

Please sign in to comment.