Merge pull request #360 from mitchmindtree/update_conrod_and_vulkano

Update to vulkano 0.13 and conrod 0.66

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]

examples/vulkan/vk_hotload.rs

@@ -16,7 +16,7 @@ struct Model {
     device: Arc<vk::Device>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 struct Vertex {
     position: [f32; 2],
 }

examples/vulkan/vk_image.rs

@@ -14,7 +14,7 @@ struct Model {
     desciptor_set: Arc<dyn vk::DescriptorSet + Send + Sync>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 struct Vertex {
     position: [f32; 2],
 }

examples/vulkan/vk_image_sequence.rs

@@ -14,7 +14,7 @@ struct Model {
     desciptor_set: Arc<dyn vk::DescriptorSet + Send + Sync>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 struct Vertex {
     position: [f32; 2],
 }

examples/vulkan/vk_images.rs

@@ -14,7 +14,7 @@ struct Model {
     desciptor_set: Arc<dyn vk::DescriptorSet + Send + Sync>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 struct Vertex {
     position: [f32; 2],
 }

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),
 }

examples/vulkan/vk_quad_warp/warp.rs

@@ -13,7 +13,7 @@ pub struct Warp {
     sampler: Arc<vk::Sampler>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 struct Vertex {
     position: [f32; 3],
     v_tex_coords: [f32; 2],

examples/vulkan/vk_shader_include/mod.rs

@@ -13,7 +13,7 @@ struct Model {
     view_fbo: RefCell<ViewFbo>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone, Debug, Default)]
 struct Vertex {
     position: [f32; 2],
 }

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),
 }

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),
 }

examples/vulkan/vk_triangle.rs

@@ -13,7 +13,7 @@ struct Model {
     view_fbo: RefCell<ViewFbo>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 struct Vertex {
     position: [f32; 2],
 }

examples/vulkan/vk_triangle_raw_frame.rs

@@ -13,7 +13,7 @@ struct Model {
     framebuffers: RefCell<window::SwapchainFramebuffers>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 struct Vertex {
     position: [f32; 2],
 }

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.
     // ///

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<Arc<dyn vk::RenderPassAbstract + Send + Sync>>;
 
+/// 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<vk::ImmutableImage<vk::Format>>;
+
 /// A map from `image::Id`s to their associated `Texture2d`.
 pub type ImageMap = conrod_core::image::Map<conrod_vulkano::Image>;
 
@@ -683,7 +688,6 @@ pub fn draw_primitives(
 }
 
 mod conrod_winit_conv {
-    use crate::conrod_winit::*;
     conrod_winit::conversion_fns!();
 }