From d09f702e87c146b98d934370cc891b46bd092bdf Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Mon, 15 Jun 2015 09:30:12 -0600 Subject: tests: Remove the enablement of the "Validation" extension This accidentally got added resulting in validation layers always running. --- demos/cube.c | 4 ---- demos/tri.c | 4 ---- layers/layers_table.cpp | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/demos/cube.c b/demos/cube.c index c93cb375..cea5ffdb 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -1815,10 +1815,6 @@ static void demo_init_vk(struct demo *demo) memcpy(&instance_extensions[instance_extension_count++], &extProp, sizeof(VkExtensionProperties)); memcpy(&device_extensions[device_extension_count++], &extProp, sizeof(VkExtensionProperties)); } - if (!strcmp("Validation", extProp.name)) { - memcpy(&instance_extensions[instance_extension_count++], &extProp, sizeof(VkExtensionProperties)); - memcpy(&device_extensions[device_extension_count++], &extProp, sizeof(VkExtensionProperties)); - } if (!strcmp(DEBUG_REPORT_EXTENSION_NAME, extProp.name)) { memcpy(&instance_extensions[instance_extension_count++], &extProp, sizeof(VkExtensionProperties)); } diff --git a/demos/tri.c b/demos/tri.c index 2e680aee..2dcfaa5f 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1382,10 +1382,6 @@ static void demo_init_vk(struct demo *demo) memcpy(&instance_extensions[instance_extension_count++], &extProp, sizeof(VkExtensionProperties)); memcpy(&device_extensions[device_extension_count++], &extProp, sizeof(VkExtensionProperties)); } - if (!strcmp("Validation", extProp.name)) { - memcpy(&instance_extensions[instance_extension_count++], &extProp, sizeof(VkExtensionProperties)); - memcpy(&device_extensions[device_extension_count++], &extProp, sizeof(VkExtensionProperties)); - } } if (!WSIextFound) { ERR_EXIT("vkGetGlobalExtensionInfo failed to find the " diff --git a/layers/layers_table.cpp b/layers/layers_table.cpp index c9661e87..834bd82b 100644 --- a/layers/layers_table.cpp +++ b/layers/layers_table.cpp @@ -29,7 +29,7 @@ static device_table_map tableMap; static instance_table_map tableInstanceMap; -#define DISPATCH_MAP_DEBUG 1 +#define DISPATCH_MAP_DEBUG 0 // Map lookup must be thread safe VkLayerDispatchTable *device_dispatch_table(VkObject object) -- cgit v1.2.3