From 761171b6d2652cdd0b5b1de43899a224268124f8 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Fri, 8 Apr 2016 17:56:50 +1000
Subject: [PATCH] vulkan: only warn on not found layers

don't error out completely

https://bugzilla.gnome.org/show_bug.cgi?id=764545
---
 ext/vulkan/vkutils.c         | 24 ++++++++++++++++++------
 ext/vulkan/vkutils_private.h |  3 ++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ext/vulkan/vkutils.c b/ext/vulkan/vkutils.c
index 6223db5293..4b547550a4 100644
--- a/ext/vulkan/vkutils.c
+++ b/ext/vulkan/vkutils.c
@@ -29,22 +29,34 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_CONTEXT);
 
 gboolean
 _check_for_all_layers (uint32_t check_count, const char **check_names,
-    uint32_t layer_count, VkLayerProperties * layers)
+    uint32_t layer_count, VkLayerProperties * layers,
+    guint32 * supported_layers_count, gchar *** supported_layers)
 {
-  uint32_t i, j;
+  uint32_t i, j, k;
+
+  if (check_count <= 0 || layer_count <= 0) {
+    GST_WARNING ("no layers requested or supported");
+    return FALSE;
+  }
+
+  *supported_layers = g_new0 (gchar *, check_count + 1);
+  k = 0;
 
   for (i = 0; i < check_count; i++) {
     gboolean found = FALSE;
     for (j = 0; j < layer_count; j++) {
       if (g_strcmp0 (check_names[i], layers[j].layerName) == 0) {
+        GST_TRACE ("found layer: %s", check_names[i]);
         found = TRUE;
+        (*supported_layers)[k++] = g_strdup (check_names[i]);
       }
     }
-    if (!found) {
-      GST_ERROR ("Cannot find layer: %s", check_names[i]);
-      return FALSE;
-    }
+    if (!found)
+      GST_WARNING ("Cannot find layer: %s", check_names[i]);
   }
+
+  *supported_layers_count = g_strv_length (*supported_layers);
+
   return TRUE;
 }
 
diff --git a/ext/vulkan/vkutils_private.h b/ext/vulkan/vkutils_private.h
index aebf44b7d3..c1debbe806 100644
--- a/ext/vulkan/vkutils_private.h
+++ b/ext/vulkan/vkutils_private.h
@@ -26,7 +26,8 @@
 G_BEGIN_DECLS
 
 gboolean _check_for_all_layers (uint32_t check_count, const char ** check_names,
-    uint32_t layer_count, VkLayerProperties * layers);
+    uint32_t layer_count, VkLayerProperties * layers, guint32 * enabled_layer_count,
+    gchar *** enabled_layers);
 
 G_END_DECLS