From 7ddd1914fbc2529bc9b38a86df3a515f3cbd34cc Mon Sep 17 00:00:00 2001 From: Lenny Komow Date: Tue, 13 Feb 2018 10:30:02 -0700 Subject: loader: Fix loader skipping layer files Fix a bug where having a json file in the layer path that isn't a valid layer would cause the other valid layers to be skipped Change-Id: I8346bd223358f271a48799d249d3b3a941dd31f8 --- loader/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/loader/loader.c b/loader/loader.c index dcb2ef1e..4e260674 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -3630,7 +3630,8 @@ void loader_layer_scan(const struct loader_instance *inst, struct loader_layer_l VkResult local_res = loader_add_layer_properties(inst, instance_layers, json, (implicit == 1), file_str); cJSON_Delete(json); - if (VK_SUCCESS != local_res) { + // If the error is anything other than out of memory we still want to try to load the other layers + if (VK_ERROR_OUT_OF_HOST_MEMORY == local_res) { goto out; } } -- cgit v1.2.3