alex/librashader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rt: fix tests

Browse source
This commit is contained in:
chyyran 2024-02-15 01:04:49 -05:00 committed by Ronny Chan
parent adeb9435fc
commit d6f1af8691
5 changed files with 28 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
Cargo.lock generated
View file

@ -1527,9 +1527,9 @@ dependencies = [
"halfbrown", "halfbrown",
"icrate 0.1.0", "icrate 0.1.0",
"librashader-cache", "librashader-cache",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"librashader-runtime-d3d11", "librashader-runtime-d3d11",
@ -1584,15 +1584,6 @@ dependencies = [
"windows 0.48.0", "windows 0.48.0",
] ]
[[package]]
name = "librashader-common"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad5041e5e0a2a30e800f2337e987f4cd7faa2bf82cb29c8f974e926f48bf450a"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "librashader-common" name = "librashader-common"
version = "0.2.0-rc.2" version = "0.2.0-rc.2"
@ -1613,32 +1604,18 @@ version = "0.2.0-rc.2"
dependencies = [ dependencies = [
"encoding_rs", "encoding_rs",
"glob", "glob",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-presets 0.1.4",
"nom", "nom",
"rayon", "rayon",
"thiserror", "thiserror",
] ]
[[package]]
name = "librashader-presets"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dff9682cba59d2e09c3920edddd97c3f103b67904cfa8b18a6cae93cf7761c4"
dependencies = [
"librashader-common 0.1.4",
"nom",
"nom_locate",
"num-traits",
"thiserror",
]
[[package]] [[package]]
name = "librashader-presets" name = "librashader-presets"
version = "0.2.0-rc.2" version = "0.2.0-rc.2"
dependencies = [ dependencies = [
"glob", "glob",
"librashader-common 0.2.0-rc.2", "librashader-common",
"nom", "nom",
"nom_locate", "nom_locate",
"num-traits", "num-traits",
@ -1657,9 +1634,9 @@ dependencies = [
"bytemuck", "bytemuck",
"glslang", "glslang",
"indexmap 2.2.3", "indexmap 2.2.3",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-spirv-cross", "librashader-spirv-cross",
"matches", "matches",
"naga", "naga",
@ -1677,9 +1654,9 @@ version = "0.2.0-rc.2"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"image", "image",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"num-traits", "num-traits",
"tinymap", "tinymap",
@ -1693,9 +1670,9 @@ dependencies = [
"bytemuck", "bytemuck",
"gfx-maths", "gfx-maths",
"librashader-cache", "librashader-cache",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"rayon", "rayon",
@ -1713,9 +1690,9 @@ dependencies = [
"bytemuck", "bytemuck",
"gfx-maths", "gfx-maths",
"librashader-cache", "librashader-cache",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"parking_lot", "parking_lot",
@ -1734,9 +1711,9 @@ dependencies = [
"gl", "gl",
"glfw 0.47.0", "glfw 0.47.0",
"librashader-cache", "librashader-cache",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"librashader-spirv-cross", "librashader-spirv-cross",
@ -1752,9 +1729,9 @@ dependencies = [
"array-concat", "array-concat",
"bytemuck", "bytemuck",
"icrate 0.1.0", "icrate 0.1.0",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"objc2 0.5.0", "objc2 0.5.0",
@ -1773,9 +1750,9 @@ dependencies = [
"glfw 0.49.1", "glfw 0.49.1",
"gpu-allocator 0.22.0", "gpu-allocator 0.22.0",
"librashader-cache", "librashader-cache",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"num", "num",
@ -1795,9 +1772,9 @@ dependencies = [
"config", "config",
"env_logger", "env_logger",
"image", "image",
"librashader-common 0.2.0-rc.2", "librashader-common",
"librashader-preprocess", "librashader-preprocess",
"librashader-presets 0.2.0-rc.2", "librashader-presets",
"librashader-reflect", "librashader-reflect",
"librashader-runtime", "librashader-runtime",
"log", "log",

1
librashader-preprocess/Cargo.toml
View file

@ -22,6 +22,5 @@ default = [ "line_directives" ]
line_directives = [] line_directives = []
[dev-dependencies] [dev-dependencies]
librashader-presets = "0.1.0-rc.3"
glob = "0.3.1" glob = "0.3.1"
rayon = "1.6.1" rayon = "1.6.1"

3
librashader-runtime-vk/tests/hello_triangle/mod.rs
View file

@ -259,6 +259,9 @@ impl VulkanWindow {
Some(&FrameOptionsVulkan { Some(&FrameOptionsVulkan {
clear_history: frame == 0, clear_history: frame == 0,
frame_direction: 0, frame_direction: 0,
current_subframe: 1,
rotation: 0,
total_subframes: 1,
}), }),
) )
.unwrap(); .unwrap();

2
librashader-runtime-vk/tests/triangle.rs
View file

@ -11,7 +11,7 @@ fn triangle_vk() {
unsafe { unsafe {
let filter = FilterChainVulkan::load_from_path( let filter = FilterChainVulkan::load_from_path(
"../test/shaders_slang/crt/crt-royale.slangp", "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp",
// "../test/Mega_Bezel_Packs/Duimon-Mega-Bezel/Presets/Advanced/Nintendo_GBA_SP/GBA_SP-[ADV]-[LCD-GRID]-[Night].slangp", // "../test/Mega_Bezel_Packs/Duimon-Mega-Bezel/Presets/Advanced/Nintendo_GBA_SP/GBA_SP-[ADV]-[LCD-GRID]-[Night].slangp",
&base, &base,
// "../test/slang-shaders/test/feedback.slancargogp", // "../test/slang-shaders/test/feedback.slancargogp",

6
librashader-runtime-wgpu/tests/hello_triangle.rs
View file

@ -118,8 +118,10 @@ impl<'a> State<'a> {
let device = Arc::new(device); let device = Arc::new(device);
let queue = Arc::new(queue); let queue = Arc::new(queue);
let preset = let preset = ShaderPreset::try_parse(
ShaderPreset::try_parse("../test/shaders_slang/crt/crt-royale.slangp").unwrap(); "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp",
)
.unwrap();
let chain = FilterChainWgpu::load_from_preset( let chain = FilterChainWgpu::load_from_preset(
preset, preset,