tests: Remove refs to device layers in tests + framework
Change-Id: I0ad12f7be17180688bd77168ba086b2b804f1637
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 2a61f42..9933e5e 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -280,7 +280,6 @@
virtual void SetUp() {
std::vector<const char *> instance_layer_names;
- std::vector<const char *> device_layer_names;
std::vector<const char *> instance_extension_names;
std::vector<const char *> device_extension_names;
@@ -300,14 +299,6 @@
instance_layer_names.push_back("VK_LAYER_LUNARG_swapchain");
instance_layer_names.push_back("VK_LAYER_GOOGLE_unique_objects");
- device_layer_names.push_back("VK_LAYER_GOOGLE_threading");
- device_layer_names.push_back("VK_LAYER_LUNARG_parameter_validation");
- device_layer_names.push_back("VK_LAYER_LUNARG_object_tracker");
- device_layer_names.push_back("VK_LAYER_LUNARG_core_validation");
- device_layer_names.push_back("VK_LAYER_LUNARG_image");
- device_layer_names.push_back("VK_LAYER_LUNARG_swapchain");
- device_layer_names.push_back("VK_LAYER_GOOGLE_unique_objects");
-
if (m_enableWSI) {
instance_extension_names.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
device_extension_names.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
@@ -341,9 +332,8 @@
this->app_info.apiVersion = VK_API_VERSION_1_0;
m_errorMonitor = new ErrorMonitor;
- InitFramework(instance_layer_names, device_layer_names,
- instance_extension_names, device_extension_names,
- myDbgFunc, m_errorMonitor);
+ InitFramework(instance_layer_names, instance_extension_names,
+ device_extension_names, myDbgFunc, m_errorMonitor);
}
virtual void TearDown() {
@@ -3205,14 +3195,7 @@
queue_info.push_back(qi);
}
- std::vector<const char *> device_layer_names;
std::vector<const char *> device_extension_names;
- device_layer_names.push_back("VK_LAYER_GOOGLE_threading");
- device_layer_names.push_back("VK_LAYER_LUNARG_parameter_validation");
- device_layer_names.push_back("VK_LAYER_LUNARG_object_tracker");
- device_layer_names.push_back("VK_LAYER_LUNARG_core_validation");
- device_layer_names.push_back("VK_LAYER_LUNARG_image");
- device_layer_names.push_back("VK_LAYER_GOOGLE_unique_objects");
// The sacrificial device object
VkDevice testDevice;
@@ -3222,8 +3205,8 @@
device_create_info.pNext = NULL;
device_create_info.queueCreateInfoCount = queue_info.size();
device_create_info.pQueueCreateInfos = queue_info.data();
- device_create_info.enabledLayerCount = device_layer_names.size();
- device_create_info.ppEnabledLayerNames = device_layer_names.data();
+ device_create_info.enabledLayerCount = 0;
+ device_create_info.ppEnabledLayerNames = NULL;
device_create_info.pEnabledFeatures = &features;
err = vkCreateDevice(gpu(), &device_create_info, NULL, &testDevice);
ASSERT_VK_SUCCESS(err);
diff --git a/tests/test_environment.cpp b/tests/test_environment.cpp
index 246a175..9427b67 100644
--- a/tests/test_environment.cpp
+++ b/tests/test_environment.cpp
@@ -85,7 +85,6 @@
std::vector<const char *> instance_extension_names;
std::vector<const char *> device_extension_names;
- std::vector<const char *> device_layer_names;
instance_extension_names.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
device_extension_names.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
@@ -150,7 +149,7 @@
for (uint32_t i = 0; i < count; i++) {
devs_.push_back(new Device(gpus[i]));
if (i == default_dev_) {
- devs_[i]->init(device_layer_names, device_extension_names);
+ devs_[i]->init(device_extension_names);
ASSERT_NE(true, devs_[i]->graphics_queues().empty());
}
}
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 33105fe..0039423 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -95,7 +95,6 @@
void VkRenderFramework::InitFramework() {
std::vector<const char *> instance_layer_names;
- std::vector<const char *> device_layer_names;
std::vector<const char *> instance_extension_names;
std::vector<const char *> device_extension_names;
instance_extension_names.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
@@ -107,13 +106,12 @@
#ifdef VK_USE_PLATFORM_XCB_KHR
instance_extension_names.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
#endif
- InitFramework(instance_layer_names, device_layer_names,
- instance_extension_names, device_extension_names);
+ InitFramework(instance_layer_names, instance_extension_names,
+ device_extension_names);
}
void VkRenderFramework::InitFramework(
std::vector<const char *> instance_layer_names,
- std::vector<const char *> device_layer_names,
std::vector<const char *> instance_extension_names,
std::vector<const char *> device_extension_names,
PFN_vkDebugReportCallbackEXT dbgFunction, void *userData) {
@@ -178,8 +176,7 @@
}
/* TODO: Verify requested physical device extensions are available */
- m_device =
- new VkDeviceObj(0, objs[0], device_layer_names, device_extension_names);
+ m_device = new VkDeviceObj(0, objs[0], device_extension_names);
/* Now register callback on device */
if (0) {
@@ -440,10 +437,9 @@
}
VkDeviceObj::VkDeviceObj(uint32_t id, VkPhysicalDevice obj,
- std::vector<const char *> &layer_names,
std::vector<const char *> &extension_names)
: vk_testing::Device(obj), id(id) {
- init(layer_names, extension_names);
+ init(extension_names);
props = phy().properties();
queue_props = phy().queue_properties();
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index fbbad7a..4d71ae9 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -38,7 +38,6 @@
public:
VkDeviceObj(uint32_t id, VkPhysicalDevice obj);
VkDeviceObj(uint32_t id, VkPhysicalDevice obj,
- std::vector<const char *> &layers,
std::vector<const char *> &extension_names);
VkDevice device() { return handle(); }
@@ -72,7 +71,6 @@
void InitRenderTarget(uint32_t targets, VkImageView *dsBinding);
void InitFramework();
void InitFramework(std::vector<const char *> instance_layer_names,
- std::vector<const char *> device_layer_names,
std::vector<const char *> instance_extension_names,
std::vector<const char *> device_extension_names,
PFN_vkDebugReportCallbackEXT = NULL,
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 8ef00d9..481df35 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -271,8 +271,7 @@
vkDestroyDevice(handle(), NULL);
}
-void Device::init(std::vector<const char *> &layers,
- std::vector<const char *> &extensions) {
+void Device::init(std::vector<const char *> &extensions) {
// request all queues
const std::vector<VkQueueFamilyProperties> queue_props =
phy_.queue_properties();
@@ -302,8 +301,8 @@
dev_info.pNext = NULL;
dev_info.queueCreateInfoCount = queue_info.size();
dev_info.pQueueCreateInfos = queue_info.data();
- dev_info.enabledLayerCount = layers.size();
- dev_info.ppEnabledLayerNames = layers.data();
+ dev_info.enabledLayerCount = 0;
+ dev_info.ppEnabledLayerNames = NULL;
dev_info.enabledExtensionCount = extensions.size();
dev_info.ppEnabledExtensionNames = extensions.data();
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 6eb113c..c0667cb 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -148,13 +148,11 @@
// vkCreateDevice()
void init(const VkDeviceCreateInfo &info);
- void init(std::vector<const char *> &layers,
- std::vector<const char *> &
- extensions); // all queues, all extensions, etc
+ void init(std::vector<const char *>
+ &extensions); // all queues, all extensions, etc
void init() {
- std::vector<const char *> layers;
std::vector<const char *> extensions;
- init(layers, extensions);
+ init(extensions);
};
const PhysicalDevice &phy() const { return phy_; }