aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ashburn <jon@lunarg.com>2015-06-15 09:30:12 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-06-18 10:22:57 -0600
commitd09f702e87c146b98d934370cc891b46bd092bdf (patch)
tree5660d6f089f3df02edbf8dca784647e065aab7a6
parentc71879da3c2b3b3360b1bd0a77b944fbeb3a4d94 (diff)
downloadusermoji-d09f702e87c146b98d934370cc891b46bd092bdf.tar.xz
tests: Remove the enablement of the "Validation" extension
This accidentally got added resulting in validation layers always running.
-rw-r--r--demos/cube.c4
-rw-r--r--demos/tri.c4
-rw-r--r--layers/layers_table.cpp2
3 files changed, 1 insertions, 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)