From 38353545030e8b3bd556713f56b5e090e3d43435 Mon Sep 17 00:00:00 2001 From: hodasemi Date: Mon, 10 Mar 2025 19:27:09 +0100 Subject: [PATCH] Fix shaderc changes --- Cargo.toml | 2 -- engine/Cargo.toml | 1 - .../src/scene/rendering/shared/shadercompiler.rs | 14 ++++++-------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6f97981..3e7d1be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,12 +27,10 @@ itertools = "0.14.0" serde = { version = "1.0.203", features = ["derive"] } ron = "0.8.1" paste = "1.0.15" -rayon = "1.10.0" chrono = { version = "0.4.35", features = ["serde"] } anyhow = { version = "1.0.86", features = ["backtrace"] } indexmap = { version = "2.2.6", features = ["rayon"] } shaderc = { version = "0.9.0", features = ["build-from-source"] } -rusqlite = { version = "0.33.0", features = ["bundled"] } cgmath = "0.18.0" http = "1.1.0" iterchunks = "0.5.0" diff --git a/engine/Cargo.toml b/engine/Cargo.toml index d51dfc6..bf4e9f3 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -9,7 +9,6 @@ edition = "2024" serde = { workspace = true } ron = { workspace = true } paste = { workspace = true } -rayon = { workspace = true } # chrono = { workspace = true } anyhow = { workspace = true } indexmap = { workspace = true } diff --git a/engine/src/scene/rendering/shared/shadercompiler.rs b/engine/src/scene/rendering/shared/shadercompiler.rs index c73e611..7f90a56 100644 --- a/engine/src/scene/rendering/shared/shadercompiler.rs +++ b/engine/src/scene/rendering/shared/shadercompiler.rs @@ -4,7 +4,7 @@ pub(crate) use shaderc::{ CompileOptions, Compiler, IncludeType, ResolvedInclude, ShaderKind, SpirvVersion, }; -use anyhow::Result; +use anyhow::{Result, anyhow}; use std::sync::Arc; pub const SHADER_OPTION_COUNT: usize = 9; @@ -134,10 +134,8 @@ impl<'a> ShaderCompiler<'a> { fn create_compiler() -> Result { match Compiler::new() { - Some(compiler) => Ok(compiler), - None => Err(anyhow::Error::msg( - "Shaderc Error: failed creating compiler", - )), + Ok(compiler) => Ok(compiler), + Err(err) => Err(anyhow!("Shaderc Error: failed creating compiler: {err:?}",)), } } } @@ -149,9 +147,9 @@ pub trait ShaderTypeConverter { fn create_compile_options<'b>() -> Result> { match CompileOptions::new() { - Some(compile_options) => Ok(compile_options), - None => Err(anyhow::Error::msg( - "Shaderc Error: failed creating compile-options", + Ok(compile_options) => Ok(compile_options), + Err(err) => Err(anyhow!( + "Shaderc Error: failed creating compile-options {err:?}", )), } }