From 9d3423c856659362433f5c265ac67b1f7ee639cd Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Thu, 6 Oct 2016 10:43:46 +0200
Subject: [PATCH] Fix triangle example

---
 examples/src/bin/triangle.rs      | 8 ++++----
 vulkano/src/command_buffer/mod.rs | 1 +
 vulkano/src/framebuffer/macros.rs | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/src/bin/triangle.rs b/examples/src/bin/triangle.rs
index e3f2de7f..1438a3fe 100644
--- a/examples/src/bin/triangle.rs
+++ b/examples/src/bin/triangle.rs
@@ -34,10 +34,10 @@ use vulkano_win::VkSurfaceBuild;
 use vulkano::buffer::BufferUsage;
 use vulkano::buffer::CpuAccessibleBuffer;
 use vulkano::command_buffer::DynamicState;
-use vulkano::command_buffer::std::PrimaryCbBuilder;
-use vulkano::command_buffer::std::StdCommandsList;
-use vulkano::command_buffer::submit::CommandBuffer;
-use vulkano::command_buffer::submit::Submission;
+use vulkano::command_buffer::PrimaryCbBuilder;
+use vulkano::command_buffer::CommandsList;
+use vulkano::command_buffer::Submit;
+use vulkano::command_buffer::Submission;
 use vulkano::descriptor::pipeline_layout::EmptyPipeline;
 use vulkano::device::Device;
 use vulkano::framebuffer::StdFramebuffer;
diff --git a/vulkano/src/command_buffer/mod.rs b/vulkano/src/command_buffer/mod.rs
index 96e1b345..7b94f78b 100644
--- a/vulkano/src/command_buffer/mod.rs
+++ b/vulkano/src/command_buffer/mod.rs
@@ -42,6 +42,7 @@
 // struct. The restrictions are enforced only in the public types.
 
 pub use self::states_manager::StatesManager;
+pub use self::std::PrimaryCbBuilder;
 pub use self::std::CommandBuffer;
 pub use self::std::CommandsList;
 pub use self::submit::Submission;
diff --git a/vulkano/src/framebuffer/macros.rs b/vulkano/src/framebuffer/macros.rs
index 443a1554..50255d83 100644
--- a/vulkano/src/framebuffer/macros.rs
+++ b/vulkano/src/framebuffer/macros.rs
@@ -339,7 +339,7 @@ macro_rules! ordered_passes_renderpass {
             )*
         }
 
-        impl<$($atch_name: TrackedImageView),*> IntoAttachmentsList for AList<$($atch_name),*> {
+        impl<$($atch_name: ImageView),*> IntoAttachmentsList for AList<$($atch_name),*> {
             type List = <($($atch_name,)*) as IntoAttachmentsList>::List;
 
             fn into_attachments_list(self) -> Self::List {
@@ -349,7 +349,7 @@ macro_rules! ordered_passes_renderpass {
 
         #[allow(non_camel_case_types)]
         #[allow(unsafe_code)]
-        unsafe impl<$($atch_name: TrackedImageView),*> RenderPassAttachmentsList<AList<$($atch_name),*>> for CustomRenderPass {
+        unsafe impl<$($atch_name: ImageView),*> RenderPassAttachmentsList<AList<$($atch_name),*>> for CustomRenderPass {
             #[inline]
             fn check_attachments_list(&self, l: &AList<$($atch_name),*>) -> Result<(), FramebufferCreationError> {
                 #![allow(unused_assignments)]