From f49c78912bd33ddbe06d44f4a01d22c85c027928 Mon Sep 17 00:00:00 2001 From: chyyran Date: Fri, 13 Jan 2023 23:58:59 -0500 Subject: [PATCH] docs: expose sys objects --- Cargo.lock | 2 ++ librashader/Cargo.toml | 21 +++++++++++++++------ librashader/src/lib.rs | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 71e3cf3..19d0bac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -773,6 +773,7 @@ dependencies = [ name = "librashader" version = "0.1.0-alpha.6" dependencies = [ + "ash", "librashader-common", "librashader-preprocess", "librashader-presets", @@ -781,6 +782,7 @@ dependencies = [ "librashader-runtime-d3d11", "librashader-runtime-gl", "librashader-runtime-vk", + "windows", ] [[package]] diff --git a/librashader/Cargo.toml b/librashader/Cargo.toml index 91519b5..c7d8db7 100644 --- a/librashader/Cargo.toml +++ b/librashader/Cargo.toml @@ -18,16 +18,25 @@ librashader-presets = { path = "../librashader-presets", version = "0.1.0-alpha. librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-alpha.6" } librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-alpha.6", features = ["standalone"] } librashader-runtime = { path = "../librashader-runtime", version = "0.1.0-alpha.6" } -librashader-runtime-d3d11 = { path = "../librashader-runtime-d3d11", version = "0.1.0-alpha.6" } -librashader-runtime-gl = { path = "../librashader-runtime-gl", version = "0.1.0-alpha.6" } -librashader-runtime-vk = { path = "../librashader-runtime-vk", version = "0.1.0-alpha.6" } +librashader-runtime-d3d11 = { path = "../librashader-runtime-d3d11", version = "0.1.0-alpha.6", optional = true } +librashader-runtime-gl = { path = "../librashader-runtime-gl", version = "0.1.0-alpha.6", optional = true } +librashader-runtime-vk = { path = "../librashader-runtime-vk", version = "0.1.0-alpha.6", optional = true } +ash = { version = "0.37.1+1.3.235", optional = true } + +[dependencies.windows] +version = "0.43.0" +features = [ + "Win32_Graphics_Direct3D11", +] +optional = true + [features] default = ["gl", "d3d11", "vk", "reflect", "preprocess", "presets" ] -gl = [ "runtime", "librashader-common/opengl" ] -d3d11 = [ "runtime", "librashader-common/d3d11" ] -vk = ["runtime", "librashader-common/vulkan" ] +gl = [ "runtime", "librashader-common/opengl", "librashader-runtime-gl" ] +d3d11 = [ "runtime", "librashader-common/d3d11", "librashader-runtime-d3d11", "windows" ] +vk = ["runtime", "librashader-common/vulkan", "librashader-runtime-vk", "ash" ] runtime = [] reflect = [] preprocess = [] diff --git a/librashader/src/lib.rs b/librashader/src/lib.rs index bb24240..bb20a53 100644 --- a/librashader/src/lib.rs +++ b/librashader/src/lib.rs @@ -69,7 +69,7 @@ pub mod preprocess { pub mod reflect { /// Supported shader compiler targets. pub mod targets { - pub use librashader_reflect::back::targets::SpirV; + pub use librashader_reflect::back::targets::SPIRV; pub use librashader_reflect::back::targets::GLSL; pub use librashader_reflect::back::targets::HLSL; }