From: Charles Giessen <charles@lunarg.com>
Date: Wed, 26 Jan 2022 22:42:21 +0000 (-0700)
Subject: Skip ICD's with non zero variant value
X-Git-Tag: upstream/v1.3.207~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a735a344c3cb27f400c6c7be0c3ef44a21781e6;p=platform%2Fupstream%2FVulkan-Loader.git

Skip ICD's with non zero variant value

If the JSON ICD Manifest contains an api_version that has a non zero variant
value, then the ICD should be skipped since it corresponds to a Vulkan variant.
---

diff --git a/loader/loader.c b/loader/loader.c
index 302e6133..735a3cbd 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -3513,6 +3513,16 @@ VkResult loader_icd_scan(const struct loader_instance *inst, struct loader_icd_t
                     loader_log(inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_DRIVER_BIT, 0,
                                "loader_icd_scan: ICD JSON %s does not have an \'api_version\' field.", file_str);
                 }
+                if (VK_API_VERSION_VARIANT(vers) != 0) {
+                    loader_log(
+                        inst, VULKAN_LOADER_INFO_BIT | VULKAN_LOADER_DRIVER_BIT, 0,
+                        "loader_icd_scan: Driver's ICD JSON %s \'api_version\' field contains a non-zero variant value of %d. "
+                        " Skipping ICD JSON.",
+                        file_str, VK_API_VERSION_VARIANT(vers));
+                    cJSON_Delete(inst, json);
+                    json = NULL;
+                    continue;
+                }
                 VkResult icd_add_res = VK_SUCCESS;
                 icd_add_res = loader_scanned_icd_add(inst, icd_tramp_list, fullpath, vers);
                 if (VK_ERROR_OUT_OF_HOST_MEMORY == icd_add_res) {