commit 30b3f3857835cadb16d4f893de35caf313cf6947
author Cody Northrop <cnorthrop@google.com> Mon Aug 17 14:28:20 2020 -0600
committer Lenny Komow <lenny@lunarg.com> Mon Aug 17 17:54:04 2020 -0600
tree 01553e789347e0356e72d5a775d34e953b08245e
parent 53949cf6e24714760d4128376d113d55fe91801f

loader: Fixes for gn build

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 3a9efde..ef25a39 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -101,8 +101,6 @@
       sources += [
         "loader/dirent_on_windows.c",
         "loader/dirent_on_windows.h",
-        "loader/dxgi_loader.c",
-        "loader/dxgi_loader.h",
         "loader/vulkan-1.def",
       ]
       if (!is_clang) {

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index ca6fda9..9bc7c7f 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -7141,7 +7141,7 @@
                             break;
                         }
                         sorted_array[*sorted_count].device_count = count;
-                    } while (vkres = icd_term->scanned_icd->EnumerateAdapterPhysicalDevices(icd_term->instance, description.AdapterLuid, &count, sorted_array[*sorted_count].physical_devices) == VK_INCOMPLETE);
+                    } while ((vkres = icd_term->scanned_icd->EnumerateAdapterPhysicalDevices(icd_term->instance, description.AdapterLuid, &count, sorted_array[*sorted_count].physical_devices)) == VK_INCOMPLETE);
                 }
 
                 if (vkres != VK_SUCCESS) {