diff --git a/Cargo.toml b/Cargo.toml index 698b1df97..2dc6851f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,9 @@ edition = "2018" [dependencies] approx = "0.1" cgmath = { version = "0.16", features = ["serde"] } -conrod_core = "0.65" -conrod_winit = "0.65" -conrod_vulkano = "0.65" +conrod_core = "0.66" +conrod_winit = "0.66" +conrod_vulkano = "0.66" daggy = "0.6" find_folder = "0.3" image = "0.21" @@ -27,9 +27,9 @@ serde = "1" serde_derive = "1" serde_json = "1" toml = "0.4" -vulkano = "0.12" -vulkano-win = "0.12" -vulkano-shaders = "0.12" +vulkano = "0.13" +vulkano-win = "0.13" +vulkano-shaders = "0.13" winit = "0.19" [dev-dependencies] diff --git a/examples/vulkan/vk_hotload.rs b/examples/vulkan/vk_hotload.rs index 88783b9e6..6d16b4180 100644 --- a/examples/vulkan/vk_hotload.rs +++ b/examples/vulkan/vk_hotload.rs @@ -16,7 +16,7 @@ struct Model { device: Arc, } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] struct Vertex { position: [f32; 2], } diff --git a/examples/vulkan/vk_image.rs b/examples/vulkan/vk_image.rs index 2edc2c69e..2448f856d 100644 --- a/examples/vulkan/vk_image.rs +++ b/examples/vulkan/vk_image.rs @@ -14,7 +14,7 @@ struct Model { desciptor_set: Arc, } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] struct Vertex { position: [f32; 2], } diff --git a/examples/vulkan/vk_image_sequence.rs b/examples/vulkan/vk_image_sequence.rs index eaf97a38c..9e26c289c 100644 --- a/examples/vulkan/vk_image_sequence.rs +++ b/examples/vulkan/vk_image_sequence.rs @@ -14,7 +14,7 @@ struct Model { desciptor_set: Arc, } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] struct Vertex { position: [f32; 2], } diff --git a/examples/vulkan/vk_images.rs b/examples/vulkan/vk_images.rs index 4b1429a1d..3d02993dc 100644 --- a/examples/vulkan/vk_images.rs +++ b/examples/vulkan/vk_images.rs @@ -14,7 +14,7 @@ struct Model { desciptor_set: Arc, } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] struct Vertex { position: [f32; 2], } diff --git a/examples/vulkan/vk_quad_warp/vk_quad_warp.rs b/examples/vulkan/vk_quad_warp/vk_quad_warp.rs index 291ddcecb..7716e6985 100644 --- a/examples/vulkan/vk_quad_warp/vk_quad_warp.rs +++ b/examples/vulkan/vk_quad_warp/vk_quad_warp.rs @@ -45,12 +45,12 @@ vk::impl_vertex!(Normal, normal); // Teapot data, sourced from `vulkano-examples`. -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Default)] pub struct Vertex { position: (f32, f32, f32), } -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Default)] pub struct Normal { normal: (f32, f32, f32), } diff --git a/examples/vulkan/vk_quad_warp/warp.rs b/examples/vulkan/vk_quad_warp/warp.rs index 24b1b0139..79ce03792 100644 --- a/examples/vulkan/vk_quad_warp/warp.rs +++ b/examples/vulkan/vk_quad_warp/warp.rs @@ -13,7 +13,7 @@ pub struct Warp { sampler: Arc, } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] struct Vertex { position: [f32; 3], v_tex_coords: [f32; 2], diff --git a/examples/vulkan/vk_shader_include/mod.rs b/examples/vulkan/vk_shader_include/mod.rs index cd2d2912b..3737eb31c 100644 --- a/examples/vulkan/vk_shader_include/mod.rs +++ b/examples/vulkan/vk_shader_include/mod.rs @@ -13,7 +13,7 @@ struct Model { view_fbo: RefCell, } -#[derive(Debug, Clone)] +#[derive(Clone, Debug, Default)] struct Vertex { position: [f32; 2], } diff --git a/examples/vulkan/vk_teapot.rs b/examples/vulkan/vk_teapot.rs index 7eee1edd6..7185241d4 100644 --- a/examples/vulkan/vk_teapot.rs +++ b/examples/vulkan/vk_teapot.rs @@ -24,12 +24,12 @@ struct Graphics { view_fbo: ViewFbo, } -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Default)] struct Vertex { position: (f32, f32, f32), } -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Default)] struct Normal { normal: (f32, f32, f32), } diff --git a/examples/vulkan/vk_teapot_camera.rs b/examples/vulkan/vk_teapot_camera.rs index 3b8fed282..b3a379a40 100644 --- a/examples/vulkan/vk_teapot_camera.rs +++ b/examples/vulkan/vk_teapot_camera.rs @@ -32,12 +32,12 @@ struct Camera { yaw: f32, } -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Default)] struct Vertex { position: (f32, f32, f32), } -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Default)] struct Normal { normal: (f32, f32, f32), } diff --git a/examples/vulkan/vk_triangle.rs b/examples/vulkan/vk_triangle.rs index c714ca89a..0ced17cf4 100644 --- a/examples/vulkan/vk_triangle.rs +++ b/examples/vulkan/vk_triangle.rs @@ -13,7 +13,7 @@ struct Model { view_fbo: RefCell, } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] struct Vertex { position: [f32; 2], } diff --git a/examples/vulkan/vk_triangle_raw_frame.rs b/examples/vulkan/vk_triangle_raw_frame.rs index bd23d786b..6f0283a6f 100644 --- a/examples/vulkan/vk_triangle_raw_frame.rs +++ b/examples/vulkan/vk_triangle_raw_frame.rs @@ -13,7 +13,7 @@ struct Model { framebuffers: RefCell, } -#[derive(Debug, Clone)] +#[derive(Debug, Default, Clone)] struct Vertex { position: [f32; 2], } diff --git a/src/draw/backend/vulkano.rs b/src/draw/backend/vulkano.rs index dfc21791e..3dba8c671 100644 --- a/src/draw/backend/vulkano.rs +++ b/src/draw/backend/vulkano.rs @@ -18,7 +18,7 @@ pub struct Renderer { } /// The `Vertex` type passed to the vertex shader. -#[derive(Copy, Clone, Debug)] +#[derive(Copy, Clone, Debug, Default)] pub struct Vertex { // /// The mode with which the `Vertex` will be drawn within the fragment shader. // /// diff --git a/src/ui.rs b/src/ui.rs index f8ec6fabd..cfbf1fa9b 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -135,6 +135,11 @@ pub enum DrawToFrameError { /// The subpass type to which the `Ui` may be rendered. pub type Subpass = vk::framebuffer::Subpass>; +/// The image type compatible with nannou's UI image map. +/// +/// The `vk::Format` format type allows for specifying dynamically determined image formats. +pub type Image = Arc>; + /// A map from `image::Id`s to their associated `Texture2d`. pub type ImageMap = conrod_core::image::Map; @@ -683,7 +688,6 @@ pub fn draw_primitives( } mod conrod_winit_conv { - use crate::conrod_winit::*; conrod_winit::conversion_fns!(); }