make ash version more flexible

librashader-capi/Cargo.toml

@@ -16,19 +16,34 @@ crate-type = [ "cdylib", "staticlib" ]
 
 [features]
 default = ["runtime-all"]
-runtime-all = ["runtime-opengl", "runtime-d3d11", "runtime-d3d12", "runtime-vulkan"]
+runtime-all = [
+	"runtime-opengl",
+	"runtime-d3d11",
+	"runtime-d3d12",
+	"runtime-vulkan",
+]
 runtime-opengl = ["gl", "librashader/runtime-gl"]
-runtime-d3d11 = ["windows", "librashader/runtime-d3d11", "windows/Win32_Graphics_Direct3D11"]
+runtime-d3d11 = [
-runtime-d3d12 = ["windows", "librashader/runtime-d3d12", "windows/Win32_Graphics_Direct3D12"]
+	"windows",
+	"librashader/runtime-d3d11",
+	"windows/Win32_Graphics_Direct3D11",
+]
+runtime-d3d12 = [
+	"windows",
+	"librashader/runtime-d3d12",
+	"windows/Win32_Graphics_Direct3D12",
+]
 runtime-vulkan = ["ash", "librashader/runtime-vk"]
 
 [dependencies]
-librashader = { path = "../librashader", version = "0.1.4", features = ["internal"] }
+librashader = { path = "../librashader", version = "0.1.4", features = [
+	"internal",
+] }
 thiserror = "1.0.37"
 paste = "1.0.9"
 gl = { version = "0.14.0", optional = true }
 rustc-hash = "1.1.0"
-ash = { version = "0.37.2+1.3.238", optional = true }
+ash = { version = "0.37", optional = true }
 spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
 
 [target.'cfg(windows)'.dependencies.windows]

librashader-common/Cargo.toml

@@ -21,7 +21,7 @@ vulkan = ["ash"]
 
 [dependencies]
 gl = { version = "0.14.0", optional = true }
-ash = { version = "0.37.1+1.3.235", optional = true }
+ash = { version = "0.37", optional = true }
 
 num-traits = "0.2.15"
 

librashader-runtime-vk/Cargo.toml

@@ -14,10 +14,13 @@ description = "RetroArch shaders for all."
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-librashader-common = { path = "../librashader-common", features = ["vulkan"], version = "0.1.4" }
+librashader-common = { path = "../librashader-common", features = [
+	"vulkan",
+], version = "0.1.4" }
 librashader-presets = { path = "../librashader-presets", version = "0.1.4" }
 librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.4" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.4", features = []   }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.4", features = [
+] }
 librashader-runtime = { path = "../librashader-runtime", version = "0.1.4" }
 librashader-cache = { path = "../librashader-cache", version = "0.1.4" }
 
@@ -25,8 +28,10 @@ spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
 rustc-hash = "1.1.0"
 bytemuck = "1.12.3"
 thiserror = "1.0.37"
-ash = { version = "0.37.1+1.3.235", features = ["linked", "debug"] }
+ash = { version = "0.37", features = ["linked", "debug"] }
-gpu-allocator = { version = "0.22.0", default-features = false, features = ["vulkan"] }
+gpu-allocator = { version = "0.22.0", default-features = false, features = [
+	"vulkan",
+] }
 parking_lot = "0.12.1"
 rayon = "1.6.1"
 

librashader/Cargo.toml

@@ -16,7 +16,9 @@ description = "RetroArch shaders for all."
 librashader-common = { path = "../librashader-common", version = "0.1.4" }
 librashader-presets = { path = "../librashader-presets", version = "0.1.4" }
 librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.4" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.4", features = ["standalone"] }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.4", features = [
+	"standalone",
+] }
 librashader-runtime = { path = "../librashader-runtime", version = "0.1.4" }
 librashader-runtime-d3d11 = { path = "../librashader-runtime-d3d11", version = "0.1.4", optional = true }
 librashader-runtime-d3d12 = { path = "../librashader-runtime-d3d12", version = "0.1.4", optional = true }
@@ -25,7 +27,7 @@ librashader-runtime-vk = { path = "../librashader-runtime-vk", version = "0.1.4"
 
 librashader-cache = { path = "../librashader-cache", version = "0.1.4" }
 
-ash = { version = "0.37.1+1.3.235", optional = true }
+ash = { version = "0.37", optional = true }
 
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.48.0"
@@ -39,10 +41,34 @@ preprocess = []
 presets = []
 
 # runtimes
-runtime-gl = [ "runtime", "reflect-cross", "librashader-common/opengl", "librashader-runtime-gl" ]
+runtime-gl = [
-runtime-d3d11 = [ "runtime", "reflect-cross","librashader-common/d3d11", "librashader-runtime-d3d11", "windows/Win32_Graphics_Direct3D11" ]
+	"runtime",
-runtime-d3d12 = [ "runtime", "reflect-cross", "reflect-dxil", "librashader-common/d3d12", "librashader-runtime-d3d12", "windows/Win32_Graphics_Direct3D12" ]
+	"reflect-cross",
-runtime-vk = ["runtime", "reflect-cross", "librashader-common/vulkan", "librashader-runtime-vk", "ash" ]
+	"librashader-common/opengl",
+	"librashader-runtime-gl",
+]
+runtime-d3d11 = [
+	"runtime",
+	"reflect-cross",
+	"librashader-common/d3d11",
+	"librashader-runtime-d3d11",
+	"windows/Win32_Graphics_Direct3D11",
+]
+runtime-d3d12 = [
+	"runtime",
+	"reflect-cross",
+	"reflect-dxil",
+	"librashader-common/d3d12",
+	"librashader-runtime-d3d12",
+	"windows/Win32_Graphics_Direct3D12",
+]
+runtime-vk = [
+	"runtime",
+	"reflect-cross",
+	"librashader-common/vulkan",
+	"librashader-runtime-vk",
+	"ash",
+]
 
 # reflection
 reflect-cross = ["reflect", "librashader-reflect/cross"]