From 93a9c5c627c492334a3e357fd96c0d911a2e85ca Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Wed, 9 Mar 2016 20:29:31 +0100
Subject: [PATCH] submit setup command buffer and idle queue before destroying
 staging images

---
 android/texture/texture.NativeActivity/main.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/android/texture/texture.NativeActivity/main.cpp b/android/texture/texture.NativeActivity/main.cpp
index 6fbf63a0..2df442c8 100644
--- a/android/texture/texture.NativeActivity/main.cpp
+++ b/android/texture/texture.NativeActivity/main.cpp
@@ -18,7 +18,7 @@
 #include <android/asset_manager.h>
 
 #define GLM_FORCE_RADIANS
-#define GLM_DEPTH_ZERO_TO_ONE
+#define GLM_FORCE_DEPTH_ZERO_TO_ONE
 #include "glm/glm.hpp"
 #include "glm/gtc/matrix_transform.hpp"
 
@@ -265,6 +265,8 @@ public:
 					texture.imageLayout);
 			}
 
+			flushSetupCommandBuffer();
+
 			// Clean up linear images 
 			// No longer required after mip levels
 			// have been transformed over to optimal tiling
@@ -338,9 +340,10 @@ public:
 				texture.image,
 				VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
 				texture.imageLayout);
+
+			flushSetupCommandBuffer();
 		}
 
-		flushSetupCommandBuffer();
 
 		// Create sampler
 		// In Vulkan textures are accessed by samplers