From b00f1f92f4e86bd04843ff68235439a8f79ccde4 Mon Sep 17 00:00:00 2001 From: chyyran Date: Thu, 23 Feb 2023 18:34:16 -0500 Subject: [PATCH] dep: remove local bml --- .gitmodules | 3 --- .idea/vcs.xml | 2 ++ Cargo.lock | 4 +++- Cargo.toml | 1 - bml | 1 - librashader-quark/Cargo.toml | 2 +- librashader-runtime-d3d11/tests/triangle.rs | 4 ++-- 7 files changed, 8 insertions(+), 9 deletions(-) delete mode 160000 bml diff --git a/.gitmodules b/.gitmodules index 5505517..f32e91f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ [submodule "test/quark-shaders"] path = test/quark-shaders url = https://github.com/hizzlekizzle/quark-shaders -[submodule "bml"] - path = bml - url = https://github.com/chyyran/bml diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 7d50221..e6daa9e 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,6 +3,8 @@ + + \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 393273d..191f7e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -199,7 +199,9 @@ dependencies = [ [[package]] name = "bml" -version = "0.3.0" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47cd661ced9603345d776f1b97350aa728602fcf9396583438935e3ea606f3b" dependencies = [ "ordered-multimap", "pest", diff --git a/Cargo.toml b/Cargo.toml index 13d72c5..05e163c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,6 @@ members = [ "librashader-capi", "librashader-quark", "librashader-build-script", - "bml" ] [workspace.metadata.release] diff --git a/bml b/bml deleted file mode 160000 index 0c932a1..0000000 --- a/bml +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c932a1fa661f542e2c6ef833c0ffefc95138fab diff --git a/librashader-quark/Cargo.toml b/librashader-quark/Cargo.toml index 9f1f976..42589df 100644 --- a/librashader-quark/Cargo.toml +++ b/librashader-quark/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bml = { path = "../bml"} \ No newline at end of file +bml = "0.3.1" \ No newline at end of file diff --git a/librashader-runtime-d3d11/tests/triangle.rs b/librashader-runtime-d3d11/tests/triangle.rs index ba4a4dc..4b8715c 100644 --- a/librashader-runtime-d3d11/tests/triangle.rs +++ b/librashader-runtime-d3d11/tests/triangle.rs @@ -13,13 +13,13 @@ use librashader_runtime_d3d11::options::FilterChainOptionsD3D11; // "../test/Mega_Bezel_Packs/Duimon-Mega-Bezel/Presets/Advanced/Nintendo_GBA_SP/GBA_SP-[ADV]-[LCD-GRID].slangp"; const FILTER_PATH: &str = - "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp"; + "../test/shaders_slang/scalefx/scalefx-9x.slangp"; // const FILTER_PATH: &str = "../test/slang-shaders/test/history.slangp"; // const FILTER_PATH: &str = "../test/slang-shaders/test/feedback.slangp"; // const FILTER_PATH: &str = "../test/slang-shaders/crt/crt-royale.slangp"; -const IMAGE_PATH: &str = "../triangle.png"; +const IMAGE_PATH: &str = "../test/finalfightlong.png"; #[test] fn triangle_d3d11_args() { let mut args = std::env::args();