commit 32517e090f3f7b5b528a345f254005f001171cb8
author Cody Northrop <cnorthrop@google.com> Fri Aug 19 09:57:31 2016 -0600
committer Cody Northrop <cnorthrop@google.com> Fri Aug 19 10:11:31 2016 -0600
tree 294db63da3f8655d1080a87574cf7a7b4620e668
parent bbab18f7184016dbc464afca235b9baea4a05fc6

Revert "tests: Move device creation from Setup to InitState"

This reverts commit 010c49d26071d5619ddd8cd43f5c8026bee1a7f2.

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index d4771f9..cd775f4 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -176,7 +176,25 @@
     }
 
     /* TODO: Verify requested physical device extensions are available */
-    this->device_extension_names = device_extension_names;
+    m_device = new VkDeviceObj(0, objs[0], device_extension_names);
+
+    /* Now register callback on device */
+    if (0) {
+        if (m_CreateDebugReportCallback) {
+            VkDebugReportCallbackCreateInfoEXT dbgInfo;
+            memset(&dbgInfo, 0, sizeof(dbgInfo));
+            dbgInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT;
+            dbgInfo.pfnCallback = dbgFunction;
+            dbgInfo.pUserData = userData;
+            dbgInfo.flags =
+                VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT;
+            err = m_CreateDebugReportCallback(this->inst, &dbgInfo, NULL,
+                                              &m_devMsgCallback);
+            ASSERT_VK_SUCCESS(err);
+        }
+    }
+    m_device->get_device_queue();
+    m_depthStencil = new VkDepthStencilObj(m_device);
 }
 
 void VkRenderFramework::ShutdownFramework() {
@@ -213,11 +231,6 @@
 void VkRenderFramework::InitState() {
     VkResult U_ASSERT_ONLY err;
 
-    m_device = new VkDeviceObj(0, objs[0], device_extension_names);
-    m_device->get_device_queue();
-
-    m_depthStencil = new VkDepthStencilObj(m_device);
-
     m_render_target_fmt = VkTestFramework::GetFormat(inst, m_device);
 
     m_lineWidth = 1.0f;