From 4232e95ebf24901f45b814c2183619ddce4e17c6 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Sun, 23 Apr 2017 16:52:12 +0200
Subject: [PATCH] Fixes in indirect drawing

---
 vulkano/src/command_buffer/auto.rs    | 1 +
 vulkano/src/command_buffer/builder.rs | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vulkano/src/command_buffer/auto.rs b/vulkano/src/command_buffer/auto.rs
index 89e95031..803a8ee4 100644
--- a/vulkano/src/command_buffer/auto.rs
+++ b/vulkano/src/command_buffer/auto.rs
@@ -162,6 +162,7 @@ pass_through!((S, D), commands_raw::CmdCopyBuffer<S, D>);
 pass_through!((S, D), commands_raw::CmdCopyBufferToImage<S, D>);
 pass_through!((), commands_raw::CmdDrawRaw);
 pass_through!((), commands_raw::CmdDrawIndexedRaw);
+pass_through!((B), commands_raw::CmdDrawIndirectRaw<B>);
 pass_through!((), commands_raw::CmdEndRenderPass);
 pass_through!((C), commands_raw::CmdExecuteCommands<C>);
 pass_through!((B), commands_raw::CmdFillBuffer<B>);
diff --git a/vulkano/src/command_buffer/builder.rs b/vulkano/src/command_buffer/builder.rs
index f0f746da..e6d8badc 100644
--- a/vulkano/src/command_buffer/builder.rs
+++ b/vulkano/src/command_buffer/builder.rs
@@ -204,14 +204,13 @@ pub unsafe trait CommandBufferBuilder: DeviceOwned {
     ///
     /// Can only be used from inside a render pass.
     #[inline]
-    fn draw_indirect<P, S, Pc, V, B, I, O>(self, pipeline: P, dynamic: DynamicState,
+    fn draw_indirect<P, S, Pc, V, B, O>(self, pipeline: P, dynamic: DynamicState,
         vertices: V, indirect_buffer: B, sets: S, push_constants: Pc) -> Result<O, CommandAddError>
         where Self: Sized + AddCommand<commands_extra::CmdDrawIndirect<V, B::Access, P, S, Pc>, Out = O>,
               S: DescriptorSetsCollection,
               P: VertexSource<V> + GraphicsPipelineAbstract + Clone,
               B: Buffer,
-              B::Access: TypedBuffer<Content = [DrawIndirectCommand]>,
-              I: Index + 'static
+              B::Access: TypedBuffer<Content = [DrawIndirectCommand]>
     {
         let cmd = commands_extra::CmdDrawIndirect::new(pipeline, dynamic, vertices, indirect_buffer.access(),
                                            sets, push_constants);