commit 9b9fe78ced634e30798c8efc76c041abdb9c58eb
author Tony Barbour <tony@LunarG.com> Thu Apr 23 15:28:27 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Apr 23 16:44:13 2015 -0600
tree eb85aeeafdfea0ee01fdfe79f6d5f14d9475c00d
parent 3fdff9eddab6db7c298ddbd4ad78a29c85320c44

tests: layer init moved to instance create - drop from device

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index d67a700..864f37d 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -60,11 +60,11 @@
 
 void VkRenderFramework::InitFramework()
 {
-     const std::vector<const char *> layers;
-     InitFramework(layers);
+     const std::vector<const char *> extensions;
+     InitFramework(extensions);
 }
 
-void VkRenderFramework::InitFramework(const std::vector<const char *> &layers)
+void VkRenderFramework::InitFramework(const std::vector<const char *> &extensions)
 {
     VkResult err;
     VkInstanceCreateInfo instInfo = {};
@@ -72,8 +72,8 @@
     instInfo.pNext = NULL;
     instInfo.pAppInfo = &app_info;
     instInfo.pAllocCb = NULL;
-    instInfo.extensionCount = 0;
-    instInfo.ppEnabledExtensionNames = NULL;
+    instInfo.extensionCount = extensions.size();
+    instInfo.ppEnabledExtensionNames = (extensions.size()) ? &extensions[0] : NULL;;
     err = vkCreateInstance(&instInfo, &this->inst);
     ASSERT_VK_SUCCESS(err);
     err = vkEnumeratePhysicalDevices(inst, &this->gpu_count, NULL);
@@ -83,7 +83,7 @@
     ASSERT_VK_SUCCESS(err);
     ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
-    m_device = new VkDeviceObj(0, objs[0], layers);
+    m_device = new VkDeviceObj(0, objs[0]);
     m_device->get_device_queue();
 
     m_depthStencil = new VkDepthStencilObj();
@@ -271,15 +271,6 @@
     queue_props = &gpu().queue_properties()[0];
 }
 
-VkDeviceObj::VkDeviceObj(uint32_t id, VkPhysicalDevice obj, const std::vector<const char *> &layers) :
-    vk_testing::Device(obj), id(id)
-{
-    init(layers);
-
-    props = gpu().properties();
-    queue_props = &gpu().queue_properties()[0];
-}
-
 void VkDeviceObj::get_device_queue()
 {
     ASSERT_NE(true, graphics_queues().empty());