diff --git a/librashader-runtime-d3d11/tests/hello_triangle/mod.rs b/librashader-runtime-d3d11/tests/hello_triangle/mod.rs index 869817f..62431a0 100644 --- a/librashader-runtime-d3d11/tests/hello_triangle/mod.rs +++ b/librashader-runtime-d3d11/tests/hello_triangle/mod.rs @@ -291,7 +291,9 @@ pub mod d3d11_hello_triangle { image: Option, ) -> Result { let (dxgi_factory, device, context) = create_device()?; - let filter = FilterChainD3D11::load_from_path(filter, &device, filter_options).unwrap(); + let filter = unsafe { + FilterChainD3D11::load_from_path(filter, &device, filter_options).unwrap() + }; let lut = if let Some(image) = image { let lut = ExampleTexture::new( &device, diff --git a/librashader-runtime-d3d12/tests/hello_triangle/mod.rs b/librashader-runtime-d3d12/tests/hello_triangle/mod.rs index 75a050c..a0f27c8 100644 --- a/librashader-runtime-d3d12/tests/hello_triangle/mod.rs +++ b/librashader-runtime-d3d12/tests/hello_triangle/mod.rs @@ -288,7 +288,9 @@ pub mod d3d12_hello_triangle { } } - let filter = FilterChainD3D12::load_from_path(filter, &device, None).unwrap(); + let filter = unsafe { + FilterChainD3D12::load_from_path(filter, &device, None).unwrap() + }; Ok(Sample { dxgi_factory, diff --git a/librashader-runtime-gl/tests/triangle.rs b/librashader-runtime-gl/tests/triangle.rs index 3406c63..0d83ba0 100644 --- a/librashader-runtime-gl/tests/triangle.rs +++ b/librashader-runtime-gl/tests/triangle.rs @@ -6,36 +6,41 @@ use librashader_runtime_gl::FilterChainGL; #[test] fn triangle_gl() { let (glfw, window, events, shader, vao) = hello_triangle::gl3::setup(); - let mut filter = FilterChainGL::load_from_path( - "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", - Some(&FilterChainOptionsGL { - glsl_version: 0, - use_dsa: false, - force_no_mipmaps: false, - disable_cache: false, - }), - ) - // FilterChain::load_from_path("../test/slang-shaders/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", None) - .unwrap(); - hello_triangle::gl3::do_loop(glfw, window, events, shader, vao, &mut filter); + + unsafe { + let mut filter = FilterChainGL::load_from_path( + "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", + Some(&FilterChainOptionsGL { + glsl_version: 0, + use_dsa: false, + force_no_mipmaps: false, + disable_cache: false, + }), + ) + // FilterChain::load_from_path("../test/slang-shaders/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", None) + .unwrap(); + hello_triangle::gl3::do_loop(glfw, window, events, shader, vao, &mut filter); + } } #[test] fn triangle_gl46() { let (glfw, window, events, shader, vao) = hello_triangle::gl46::setup(); - let mut filter = FilterChainGL::load_from_path( - // "../test/slang-shaders/vhs/VHSPro.slangp", - // "../test/slang-shaders/test/history.slangp", - // "../test/slang-shaders/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", - "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", - Some(&FilterChainOptionsGL { - glsl_version: 0, - use_dsa: true, - force_no_mipmaps: false, - disable_cache: false, - }), - ) - // FilterChain::load_from_path("../test/slang-shaders/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", None) - .unwrap(); - hello_triangle::gl46::do_loop(glfw, window, events, shader, vao, &mut filter); + unsafe { + let mut filter = FilterChainGL::load_from_path( + // "../test/slang-shaders/vhs/VHSPro.slangp", + // "../test/slang-shaders/test/history.slangp", + // "../test/slang-shaders/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", + "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", + Some(&FilterChainOptionsGL { + glsl_version: 0, + use_dsa: true, + force_no_mipmaps: false, + disable_cache: false, + }), + ) + // FilterChain::load_from_path("../test/slang-shaders/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp", None) + .unwrap(); + hello_triangle::gl46::do_loop(glfw, window, events, shader, vao, &mut filter); + } } diff --git a/librashader-runtime-vk/tests/triangle.rs b/librashader-runtime-vk/tests/triangle.rs index 2c38739..f5e3f38 100644 --- a/librashader-runtime-vk/tests/triangle.rs +++ b/librashader-runtime-vk/tests/triangle.rs @@ -8,22 +8,25 @@ use librashader_runtime_vk::FilterChainVulkan; fn triangle_vk() { let entry = unsafe { ash::Entry::load().unwrap() }; let base = VulkanBase::new(entry).unwrap(); - let filter = FilterChainVulkan::load_from_path( - // "../test/slang-shaders/crt/crt-royale.slangp", - "../test/Mega_Bezel_Packs/Duimon-Mega-Bezel/Presets/Advanced/Nintendo_GBA_SP/GBA_SP-[ADV]-[LCD-GRID]-[Night].slangp", - &base, - // "../test/slang-shaders/test/feedback.slancargogp", - // "../test/basic.slangp", - Some(&FilterChainOptionsVulkan { - frames_in_flight: 3, - force_no_mipmaps: false, - use_render_pass: true, - disable_cache: false, - }), - ) - .unwrap(); - hello_triangle::main(base, filter) + unsafe { + let filter = FilterChainVulkan::load_from_path( + // "../test/slang-shaders/crt/crt-royale.slangp", + "../test/Mega_Bezel_Packs/Duimon-Mega-Bezel/Presets/Advanced/Nintendo_GBA_SP/GBA_SP-[ADV]-[LCD-GRID]-[Night].slangp", + &base, + // "../test/slang-shaders/test/feedback.slancargogp", + // "../test/basic.slangp", + Some(&FilterChainOptionsVulkan { + frames_in_flight: 3, + force_no_mipmaps: false, + use_render_pass: true, + disable_cache: false, + }), + ) + .unwrap(); + + hello_triangle::main(base, filter) + } // let base = hello_triangle_old::ExampleBase::new(900, 600); // // let mut filter = FilterChainVulkan::load_from_path(