From c059e7c566b0a64fe7bf0939a3e80b4e84eb7019 Mon Sep 17 00:00:00 2001
From: chyyran <ronny@ronnychan.ca>
Date: Sun, 15 Jan 2023 18:21:01 -0500
Subject: [PATCH] fmt: run cargo fmt

---
 librashader-preprocess/src/lib.rs             |  5 ++---
 .../src/hello_triangle/mod.rs                 | 20 +++++++++++++------
 librashader-runtime/src/binding.rs            |  6 +++---
 librashader/src/lib.rs                        |  8 +++-----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/librashader-preprocess/src/lib.rs b/librashader-preprocess/src/lib.rs
index 45326ff..7adf0c8 100644
--- a/librashader-preprocess/src/lib.rs
+++ b/librashader-preprocess/src/lib.rs
@@ -6,8 +6,8 @@ mod stage;
 use crate::include::read_source;
 pub use error::*;
 use librashader_common::ImageFormat;
-use std::path::Path;
 use rustc_hash::FxHashMap;
+use std::path::Path;
 
 /// The source file for a single shader pass.
 #[derive(Debug, Clone, PartialEq)]
@@ -72,8 +72,7 @@ pub(crate) fn load_shader_source(path: impl AsRef<Path>) -> Result<ShaderSource,
     let source = read_source(path)?;
     let meta = pragma::parse_pragma_meta(&source)?;
     let text = stage::process_stages(&source)?;
-    let parameters = FxHashMap::from_iter(meta.parameters.into_iter()
-        .map(|p| (p.id.clone(), p)));
+    let parameters = FxHashMap::from_iter(meta.parameters.into_iter().map(|p| (p.id.clone(), p)));
 
     Ok(ShaderSource {
         vertex: text.vertex,
diff --git a/librashader-runtime-vk/src/hello_triangle/mod.rs b/librashader-runtime-vk/src/hello_triangle/mod.rs
index 479ed33..b6479f5 100644
--- a/librashader-runtime-vk/src/hello_triangle/mod.rs
+++ b/librashader-runtime-vk/src/hello_triangle/mod.rs
@@ -186,13 +186,17 @@ impl VulkanWindow {
                 vk::ImageLayout::UNDEFINED,
                 vk::ImageLayout::COLOR_ATTACHMENT_OPTIMAL,
                 vk::AccessFlags::MEMORY_READ
-                    | vk::AccessFlags::MEMORY_WRITE | vk::AccessFlags::HOST_READ | vk::AccessFlags::HOST_WRITE
-                    | vk::AccessFlags::COLOR_ATTACHMENT_READ | vk::AccessFlags::COLOR_ATTACHMENT_WRITE | vk::AccessFlags::SHADER_READ,
+                    | vk::AccessFlags::MEMORY_WRITE
+                    | vk::AccessFlags::HOST_READ
+                    | vk::AccessFlags::HOST_WRITE
+                    | vk::AccessFlags::COLOR_ATTACHMENT_READ
+                    | vk::AccessFlags::COLOR_ATTACHMENT_WRITE
+                    | vk::AccessFlags::SHADER_READ,
                 vk::AccessFlags::COLOR_ATTACHMENT_WRITE | vk::AccessFlags::COLOR_ATTACHMENT_READ,
                 vk::PipelineStageFlags::ALL_COMMANDS,
                 vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT,
                 vk::QUEUE_FAMILY_IGNORED,
-                vk::QUEUE_FAMILY_IGNORED
+                vk::QUEUE_FAMILY_IGNORED,
             );
 
             Self::record_command_buffer(vulkan, framebuffer, cmd);
@@ -205,13 +209,17 @@ impl VulkanWindow {
                 vk::ImageLayout::SHADER_READ_ONLY_OPTIMAL,
                 vk::ImageLayout::SHADER_READ_ONLY_OPTIMAL,
                 vk::AccessFlags::MEMORY_READ
-                    | vk::AccessFlags::MEMORY_WRITE | vk::AccessFlags::HOST_READ | vk::AccessFlags::HOST_WRITE
-                    | vk::AccessFlags::COLOR_ATTACHMENT_READ | vk::AccessFlags::COLOR_ATTACHMENT_WRITE | vk::AccessFlags::SHADER_READ,
+                    | vk::AccessFlags::MEMORY_WRITE
+                    | vk::AccessFlags::HOST_READ
+                    | vk::AccessFlags::HOST_WRITE
+                    | vk::AccessFlags::COLOR_ATTACHMENT_READ
+                    | vk::AccessFlags::COLOR_ATTACHMENT_WRITE
+                    | vk::AccessFlags::SHADER_READ,
                 vk::AccessFlags::SHADER_READ,
                 vk::PipelineStageFlags::ALL_COMMANDS,
                 vk::PipelineStageFlags::FRAGMENT_SHADER,
                 vk::QUEUE_FAMILY_IGNORED,
-                vk::QUEUE_FAMILY_IGNORED
+                vk::QUEUE_FAMILY_IGNORED,
             );
             //
             // util::vulkan_image_layout_transition_levels(
diff --git a/librashader-runtime/src/binding.rs b/librashader-runtime/src/binding.rs
index 507b721..d8f0397 100644
--- a/librashader-runtime/src/binding.rs
+++ b/librashader-runtime/src/binding.rs
@@ -238,12 +238,12 @@ where
         {
             let id = id.as_str();
 
-            let default = parameter_defaults.get(id)
+            let default = parameter_defaults
+                .get(id)
                 .map(|f| f.initial)
                 .unwrap_or(0f32);
 
-            let value = *runtime_parameters.get(id)
-                .unwrap_or(&default);
+            let value = *runtime_parameters.get(id).unwrap_or(&default);
 
             uniform_storage.bind_scalar(offset.offset(), value, offset.context());
         }
diff --git a/librashader/src/lib.rs b/librashader/src/lib.rs
index 7fe5943..717099a 100644
--- a/librashader/src/lib.rs
+++ b/librashader/src/lib.rs
@@ -14,8 +14,8 @@
 //! called with appropriate input and output parameters to draw a frame with the shader effect applied.
 //!
 //! ## Runtimes
-//! Currently available runtimes are OpenGL 3.3+ and 4.6 (with DSA), and Direct3D 11.
-//! Work on the Vulkan and Direct3D 12 runtimes are in progress.
+//! Currently available runtimes are Vulkan 1.3+, OpenGL 3.3+ and 4.6 (with DSA), and Direct3D 11.
+//! Work on the Direct3D 12 runtimes are in progress. The Vulkan runtime requires [`VK_KHR_dynamic_rendering`](https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_dynamic_rendering.html).
 //!
 //! | **API**     | **Status** | **`librashader` feature** |
 //! |-------------|------------|---------------------------|
@@ -47,9 +47,7 @@ pub mod presets {
         let iters: Result<Vec<Vec<ShaderParameter>>, PreprocessError> = preset
             .shaders
             .iter()
-            .map(|s| ShaderSource::load(&s.name).map(|s|
-                s.parameters.into_values()
-                    .collect()))
+            .map(|s| ShaderSource::load(&s.name).map(|s| s.parameters.into_values().collect()))
             .into_iter()
             .collect();
         let iters = iters?;