From 233130a0a3757ed7a6725b5c53142e960c87d8b8 Mon Sep 17 00:00:00 2001
From: Jeremy Hayes <jeremy@lunarg.com>
Date: Wed, 16 Nov 2016 13:42:08 -0700
Subject: demos: move cmd bfr creation out of layout util

Change-Id: I01c4f59497f4ac22f2a96bda535c7965d34156d8
---
 demos/cube.cpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'demos/cube.cpp')

diff --git a/demos/cube.cpp b/demos/cube.cpp
index e91b0c3f..f092a0c5 100644
--- a/demos/cube.cpp
+++ b/demos/cube.cpp
@@ -1179,6 +1179,15 @@ struct Demo {
                              .setLevel(vk::CommandBufferLevel::ePrimary)
                              .setCommandBufferCount(1);
 
+        result = device.allocateCommandBuffers(&cmd, &this->cmd);
+        VERIFY(result == vk::Result::eSuccess);
+
+        auto const cmd_buf_info =
+            vk::CommandBufferBeginInfo().setPInheritanceInfo(nullptr);
+
+        result = this->cmd.begin(&cmd_buf_info);
+        VERIFY(result == vk::Result::eSuccess);
+
         prepare_buffers();
         prepare_depth();
         prepare_textures();
@@ -2107,21 +2116,7 @@ struct Demo {
                           vk::AccessFlags srcAccessMask,
                           vk::PipelineStageFlags src_stages,
                           vk::PipelineStageFlags dest_stages) {
-        if (!cmd) {
-            auto const cmd = vk::CommandBufferAllocateInfo()
-                                 .setCommandPool(cmd_pool)
-                                 .setLevel(vk::CommandBufferLevel::ePrimary)
-                                 .setCommandBufferCount(1);
-
-            auto result = device.allocateCommandBuffers(&cmd, &this->cmd);
-            VERIFY(result == vk::Result::eSuccess);
-
-            auto const cmd_buf_info =
-                vk::CommandBufferBeginInfo().setPInheritanceInfo(nullptr);
-
-            result = this->cmd.begin(&cmd_buf_info);
-            VERIFY(result == vk::Result::eSuccess);
-        }
+        assert(cmd);
 
         auto DstAccessMask = [](vk::ImageLayout const &layout) {
             vk::AccessFlags flags;
-- 
cgit v1.2.3