demos/tests: Enable unique_objects layer

Using VK_LAYER_GOOGLE_unique_objects with 'cube --validate' and when
running all tests with layers.

diff --git a/demos/cube.c b/demos/cube.c
index 0801bfda80e9c4ee374b901421c97eac94f93bee..14b360acbd09f86ee7a7bb55f16e28502fb6cb73 100644 (file)
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -2130,17 +2130,19 @@ static void demo_init_vk(struct demo *demo) {
         "VK_LAYER_LUNARG_object_tracker", "VK_LAYER_LUNARG_draw_state",
         "VK_LAYER_LUNARG_param_checker",  "VK_LAYER_LUNARG_swapchain",
         "VK_LAYER_LUNARG_device_limits",  "VK_LAYER_LUNARG_image",
+        "VK_LAYER_GOOGLE_unique_objects",
     };
 
     demo->device_validation_layers[0] = "VK_LAYER_LUNARG_threading";
     demo->device_validation_layers[1] = "VK_LAYER_LUNARG_mem_tracker";
-    demo->device_validation_layers[2] = "VK_LAYER_LUNARG_object_tracker",
-    demo->device_validation_layers[3] = "VK_LAYER_LUNARG_draw_state",
-    demo->device_validation_layers[4] = "VK_LAYER_LUNARG_param_checker",
-    demo->device_validation_layers[5] = "VK_LAYER_LUNARG_swapchain",
-    demo->device_validation_layers[6] = "VK_LAYER_LUNARG_device_limits",
-    demo->device_validation_layers[7] = "VK_LAYER_LUNARG_image",
-    device_validation_layer_count = 8;
+    demo->device_validation_layers[2] = "VK_LAYER_LUNARG_object_tracker";
+    demo->device_validation_layers[3] = "VK_LAYER_LUNARG_draw_state";
+    demo->device_validation_layers[4] = "VK_LAYER_LUNARG_param_checker";
+    demo->device_validation_layers[5] = "VK_LAYER_LUNARG_swapchain";
+    demo->device_validation_layers[6] = "VK_LAYER_LUNARG_device_limits";
+    demo->device_validation_layers[7] = "VK_LAYER_LUNARG_image";
+    demo->device_validation_layers[8] = "VK_LAYER_GOOGLE_unique_objects";
+    device_validation_layer_count = 9;
 
     /* Look for validation layers */
     VkBool32 validation_found = 0;

diff --git a/demos/tri.c b/demos/tri.c
index 990a470e57de909c5ef941e664438befe45786b0..b7cc2e05661a794a54e386b464615444f8425e13 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1739,10 +1739,12 @@ static void demo_init_vk(struct demo *demo) {
 
     char *instance_validation_layers[] = {
         "VK_LAYER_LUNARG_mem_tracker",
+        "VK_LAYER_GOOGLE_unique_objects",
     };
 
     demo->device_validation_layers[0] = "VK_LAYER_LUNARG_mem_tracker";
-    device_validation_layer_count = 1;
+    demo->device_validation_layers[1] = "VK_LAYER_GOOGLE_unique_objects";
+    device_validation_layer_count = 2;
 
     /* Look for validation layers */
     VkBool32 validation_found = 0;