From bb8d9c07e7ce94f72ee07fc0f2614d34c7af71f3 Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Fri, 19 Jul 2024 22:07:58 -0700 Subject: [PATCH] test-renderers: make auto-threads optional. Also remove no-longer-used direct `rayon` dependency. --- Cargo.lock | 1 - test-renderers/Cargo.toml | 13 +++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c246d78f..cb71f3030 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5833,7 +5833,6 @@ dependencies = [ "itertools 0.12.1", "log", "mint", - "rayon", "rend3", "rend3-gltf", "rend3-routine", diff --git a/test-renderers/Cargo.toml b/test-renderers/Cargo.toml index 6c95bf1ca..b7bd25fe7 100644 --- a/test-renderers/Cargo.toml +++ b/test-renderers/Cargo.toml @@ -43,7 +43,13 @@ doctest = false harness = false [features] -default = [] +default = ["auto-threads"] +# This is a feature so that, if we want to, we can test the non-threaded build. +auto-threads = [ + "all-is-cubes/auto-threads", + "all-is-cubes-gpu/auto-threads", + "all-is-cubes-render/auto-threads", +] gltf = [ "dep:all-is-cubes-port", "dep:rend3", @@ -55,11 +61,11 @@ gltf = [ ] [dependencies] -all-is-cubes = { workspace = true, features = ["auto-threads", "save"] } +all-is-cubes = { workspace = true, features = ["save"] } all-is-cubes-content = { workspace = true } all-is-cubes-gpu = { workspace = true, features = ["wgpu"] } all-is-cubes-port = { workspace = true, optional = true, features = [] } -all-is-cubes-render = { workspace = true, features = ["auto-threads", "raytracer", "std"] } +all-is-cubes-render = { workspace = true, features = ["raytracer", "std"] } all-is-cubes-ui = { workspace = true } async_fn_traits = { workspace = true } bytemuck = { workspace = true } @@ -75,7 +81,6 @@ imgref = { workspace = true } itertools = { workspace = true } log = { workspace = true } mint = { version = "0.5.9", optional = true } -rayon = { workspace = true } rend3 = { git = "https://github.com/BVE-Reborn/rend3/", rev = "86bc4d2d2f4048a0adaa9af5ef542dc652308966", optional = true } rend3-gltf = { git = "https://github.com/BVE-Reborn/rend3/", rev = "86bc4d2d2f4048a0adaa9af5ef542dc652308966", optional = true, default-features = false } rend3-routine = { git = "https://github.com/BVE-Reborn/rend3/", rev = "86bc4d2d2f4048a0adaa9af5ef542dc652308966", optional = true }