aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLenny Komow <lenny@lunarg.com>2018-02-13 10:30:02 -0700
committerLenny Komow <lenny@lunarg.com>2018-02-13 16:07:23 -0700
commit7ddd1914fbc2529bc9b38a86df3a515f3cbd34cc (patch)
treefa4a47ee5d4030a6b6b2b14703c28f6263015e7e
parentfcafc5a38bca6bfe64cf87453dc981e085b09425 (diff)
downloadusermoji-7ddd1914fbc2529bc9b38a86df3a515f3cbd34cc.tar.xz
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
-rw-r--r--loader/loader.c3
1 files changed, 2 insertions, 1 deletions
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;
}
}