diff --git a/.idea/src.iml b/.idea/src.iml index 35705b5..e7382d5 100644 --- a/.idea/src.iml +++ b/.idea/src.iml @@ -9,10 +9,10 @@ - + diff --git a/Cargo.lock b/Cargo.lock index 18a5763..b401e0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,7 +416,7 @@ dependencies = [ "librashader-preprocess", "librashader-presets", "librashader-reflect", - "librashader-runtime-dx11", + "librashader-runtime-d3d11", "librashader-runtime-gl", ] @@ -467,7 +467,7 @@ dependencies = [ ] [[package]] -name = "librashader-runtime-dx11" +name = "librashader-runtime-d3d11" version = "0.1.0" dependencies = [ "bytemuck", diff --git a/Cargo.toml b/Cargo.toml index 5960493..030eace 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,6 @@ members = [ "librashader-presets", "librashader-preprocess", "librashader-reflect", - "librashader-runtime-dx11", + "librashader-runtime-d3d11", "librashader-runtime-gl", ] \ No newline at end of file diff --git a/README.md b/README.md index c5737dc..6b37563 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,14 @@ librashader supports OpenGL 3, Vulkan, DirectX 11, and DirectX 12. Support is WI of DirectX and OpenGL, as well as Metal, are not supported (but pull-requests are welcome). | **API** | **Status** | **`librashader` feature** | -|------------|------------|---------------------------| -| OpenGL 3 | ✔ | `gl` | -| Vulkan | 🚧 | `vk` | -| DirectX 11 | 🚧 | `dx11` | -| DirectX 12 | 🚧 | `dx12` | -| OpenGL 2 | ❌ | | -| DirectX 9 | ❌ | | -| Metal | ❌ | | +|------------|------------|--------------------------| +| OpenGL 3+ | ✔ | `gl` | +| Vulkan | 🚧 | `vk` | +| Direct3D11 | 🚧 | `d3d11` | +| Direct3D12 | 🚧 | `d3d12` | +| OpenGL 2 | ❌ | | +| DirectX 9 | ❌ | | +| Metal | ❌ | | ## Usage diff --git a/librashader-runtime-dx11/Cargo.toml b/librashader-runtime-d3d11/Cargo.toml similarity index 96% rename from librashader-runtime-dx11/Cargo.toml rename to librashader-runtime-d3d11/Cargo.toml index 23c82d0..4f0a483 100644 --- a/librashader-runtime-dx11/Cargo.toml +++ b/librashader-runtime-d3d11/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "librashader-runtime-dx11" +name = "librashader-runtime-d3d11" version = "0.1.0" edition = "2021" diff --git a/librashader-runtime-dx11/src/filter_chain.rs b/librashader-runtime-d3d11/src/filter_chain.rs similarity index 100% rename from librashader-runtime-dx11/src/filter_chain.rs rename to librashader-runtime-d3d11/src/filter_chain.rs diff --git a/librashader-runtime-dx11/src/filter_pass.rs b/librashader-runtime-d3d11/src/filter_pass.rs similarity index 100% rename from librashader-runtime-dx11/src/filter_pass.rs rename to librashader-runtime-d3d11/src/filter_pass.rs diff --git a/librashader-runtime-dx11/src/hello_triangle.rs b/librashader-runtime-d3d11/src/hello_triangle.rs similarity index 100% rename from librashader-runtime-dx11/src/hello_triangle.rs rename to librashader-runtime-d3d11/src/hello_triangle.rs diff --git a/librashader-runtime-dx11/src/lib.rs b/librashader-runtime-d3d11/src/lib.rs similarity index 97% rename from librashader-runtime-dx11/src/lib.rs rename to librashader-runtime-d3d11/src/lib.rs index ca3e3f8..b208d74 100644 --- a/librashader-runtime-dx11/src/lib.rs +++ b/librashader-runtime-d3d11/src/lib.rs @@ -30,7 +30,7 @@ mod tests { use super::*; #[test] - fn triangle_dx11() { + fn triangle_d3d11() { let sample = hello_triangle::d3d11_hello_triangle::Sample::new().unwrap(); let device = sample.device.clone(); let chain = filter_chain::FilterChain::load_from_path(&device, "../test/slang-shaders/crt/crt-royale.slangp").unwrap(); diff --git a/librashader-runtime-dx11/src/samplers.rs b/librashader-runtime-d3d11/src/samplers.rs similarity index 100% rename from librashader-runtime-dx11/src/samplers.rs rename to librashader-runtime-d3d11/src/samplers.rs diff --git a/librashader-runtime-dx11/src/texture.rs b/librashader-runtime-d3d11/src/texture.rs similarity index 100% rename from librashader-runtime-dx11/src/texture.rs rename to librashader-runtime-d3d11/src/texture.rs diff --git a/librashader-runtime-dx11/src/util.rs b/librashader-runtime-d3d11/src/util.rs similarity index 100% rename from librashader-runtime-dx11/src/util.rs rename to librashader-runtime-d3d11/src/util.rs diff --git a/librashader/Cargo.toml b/librashader/Cargo.toml index ea8edc9..9e9e681 100644 --- a/librashader/Cargo.toml +++ b/librashader/Cargo.toml @@ -9,7 +9,7 @@ librashader-common = { path = "../librashader-common" } librashader-presets = { path = "../librashader-presets" } librashader-preprocess = { path = "../librashader-preprocess" } librashader-reflect = { path = "../librashader-reflect" } -librashader-runtime-dx11 = { path = "../librashader-runtime-dx11" } +librashader-runtime-d3d11 = { path = "../librashader-runtime-d3d11" } librashader-runtime-gl = { path = "../librashader-runtime-gl" } diff --git a/librashader/src/lib.rs b/librashader/src/lib.rs index 608eca4..72a8b77 100644 --- a/librashader/src/lib.rs +++ b/librashader/src/lib.rs @@ -45,13 +45,8 @@ pub mod targets { pub mod runtime { /// Shader runtime for DirectX 11. - pub mod dx11 { - pub use librashader_runtime_dx11::*; - } - - /// Shader runtime for DirectX 12. - pub mod dx12 { - pub use librashader_runtime_dx11::*; + pub mod d3d11 { + pub use librashader_runtime_d3d11::*; } } }