From e24aaf3dd396e6240c9d1c856703dbea9465bc22 Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Sun, 16 Aug 2020 16:28:52 -0400
Subject: [PATCH 1/2] Add Draw command to RenderCommand

---
 crates/bevy_render/src/draw.rs                       |  4 ++++
 .../bevy_render/src/render_graph/nodes/pass_node.rs  | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/crates/bevy_render/src/draw.rs b/crates/bevy_render/src/draw.rs
index e2e7227764eb2..281bde6b7eeac 100644
--- a/crates/bevy_render/src/draw.rs
+++ b/crates/bevy_render/src/draw.rs
@@ -43,6 +43,10 @@ pub enum RenderCommand {
         base_vertex: i32,
         instances: Range<u32>,
     },
+    Draw {
+        vertices: Range<u32>,
+        instances: Range<u32>,
+    },
 }
 
 /// A component that indicates how to draw an entity.
diff --git a/crates/bevy_render/src/render_graph/nodes/pass_node.rs b/crates/bevy_render/src/render_graph/nodes/pass_node.rs
index 56089d8e9c3e8..70ec34003d2b1 100644
--- a/crates/bevy_render/src/render_graph/nodes/pass_node.rs
+++ b/crates/bevy_render/src/render_graph/nodes/pass_node.rs
@@ -245,6 +245,13 @@ impl<Q: HecsQuery + Send + Sync + 'static> Node for PassNode<Q> {
                                         log::info!("Could not draw indexed because the pipeline layout wasn't fully set for pipeline: {:?}", draw_state.pipeline);
                                     }
                                 }
+                                RenderCommand::Draw { vertices, instances } => {
+                                    if draw_state.can_draw() {
+                                        render_pass.draw(vertices.clone(), instances.clone());
+                                    } else {
+                                        log::info!("Could not draw because the pipeline layout wasn't fully set for pipeline: {:?}", draw_state.pipeline);
+                                    }
+                                }
                                 RenderCommand::SetVertexBuffer {
                                     buffer,
                                     offset,
@@ -306,6 +313,11 @@ impl DrawState {
         self.index_buffer = Some(buffer);
     }
 
+    pub fn can_draw(&self) -> bool {
+        self.bind_groups.iter().all(|b| b.is_some())
+            && self.vertex_buffers.iter().all(|v| v.is_some())
+    }
+
     pub fn can_draw_indexed(&self) -> bool {
         self.bind_groups.iter().all(|b| b.is_some())
             && self.vertex_buffers.iter().all(|v| v.is_some())

From ccfa815cac1412181a26190d323f4813963afb81 Mon Sep 17 00:00:00 2001
From: Lachlan Sneff <lachlan.sneff@gmail.com>
Date: Mon, 17 Aug 2020 10:56:27 -0400
Subject: [PATCH 2/2] Use can_draw in can_draw_indexed

---
 crates/bevy_render/src/render_graph/nodes/pass_node.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/crates/bevy_render/src/render_graph/nodes/pass_node.rs b/crates/bevy_render/src/render_graph/nodes/pass_node.rs
index 70ec34003d2b1..dbc46fe09fc45 100644
--- a/crates/bevy_render/src/render_graph/nodes/pass_node.rs
+++ b/crates/bevy_render/src/render_graph/nodes/pass_node.rs
@@ -319,9 +319,7 @@ impl DrawState {
     }
 
     pub fn can_draw_indexed(&self) -> bool {
-        self.bind_groups.iter().all(|b| b.is_some())
-            && self.vertex_buffers.iter().all(|v| v.is_some())
-            && self.index_buffer.is_some()
+        self.can_draw() && self.index_buffer.is_some()
     }
 
     pub fn set_pipeline(