diff options
| author | Lenny Komow <lenny@lunarg.com> | 2018-08-23 14:19:43 -0600 |
|---|---|---|
| committer | Lenny Komow <lenny@lunarg.com> | 2018-08-23 14:59:58 -0600 |
| commit | 808c5cb8f5b420adb3cf5e28aee6b6112076e27c (patch) | |
| tree | 52527e58adcfa936c8da15391deb65fcb45e486a | |
| parent | 4573f327dd9a5e4114d5c56682892290affa46e5 (diff) | |
| download | Vulkan-Loader-808c5cb8f5b420adb3cf5e28aee6b6112076e27c.tar.gz Vulkan-Loader-808c5cb8f5b420adb3cf5e28aee6b6112076e27c.tar.bz2 Vulkan-Loader-808c5cb8f5b420adb3cf5e28aee6b6112076e27c.zip | |
loader: Fix overzealous duplicate manifest warning
This downgrades the warning when a manifest file is given multiple
times to a debug message (previously it was a warning). This is
because any Windows system that has multiple GPUs that use the same
driver will encounter duplicates as correct behavior.
Change-Id: Id64f4c34d58c4b806164b3e7cd7a07dab36ab88f
| -rw-r--r-- | loader/loader.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/loader/loader.c b/loader/loader.c index 864b659e..8ad78b13 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -3370,7 +3370,10 @@ static VkResult loader_get_manifest_files(const struct loader_instance *inst, co strcpy(out_files->filename_list[out_files->count], name); out_files->count++; } else if(file_already_loaded) { - loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, + // If the file has already been loaded we want to silently skip it. We do not want to report an error because having + // multiple GPUs using the Windows PnP registries with the same driver are expected to see a duplicate entry. We + // leave this as a debug message because it can still be useful in loader debugging. + loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, "Skipping manifest file %s - The file has already been read once", name); } else if (!list_is_dirs) { loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, "Skipping manifest file %s, file name must end in .json", |