From a38cdfcca1b01db046f85dd33fbc947725dc3cc2 Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Tue, 30 Jun 2015 16:44:28 -0600
Subject: loader: Remove uneeded ICD and layers scanned boolean

Artifact of when layers and ICDs weren't scanned initially.
---
 loader/debug_report.c | 4 ----
 loader/loader.c       | 6 +-----
 loader/loader.h       | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'loader')

diff --git a/loader/debug_report.c b/loader/debug_report.c
index adebe44c..498faf8a 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -138,8 +138,6 @@ VkResult loader_DbgCreateMsgCallback(
     if (instance == VK_NULL_HANDLE)
         return VK_ERROR_INVALID_HANDLE;
 
-    assert(loader.icds_scanned);
-
     for (inst = loader.instances; inst; inst = inst->next) {
         if ((VkInstance) inst == instance)
             break;
@@ -209,8 +207,6 @@ VkResult loader_DbgDestroyMsgCallback(
     if (instance == VK_NULL_HANDLE)
         return VK_ERROR_INVALID_HANDLE;
 
-    assert(loader.icds_scanned);
-
     for (inst = loader.instances; inst; inst = inst->next) {
         if ((VkInstance) inst == instance)
             break;
diff --git a/loader/loader.c b/loader/loader.c
index 54d9f795..577024b9 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1138,7 +1138,7 @@ static void loader_get_manifest_files(const char *env_override,
  * manifest files it finds the ICD libraries.
  *
  * \returns
- * void; but side effect is to set loader_icds_scanned to true
+ * void
  */
 void loader_icd_scan(void)
 {
@@ -1152,9 +1152,6 @@ void loader_icd_scan(void)
     // convenient place to initialize logging
     loader_debug_init();
 
-    // Note that we've scanned for ICDs:
-    loader.icds_scanned = true;
-
     // Get a list of manifest files for ICDs
     loader_get_manifest_files("VK_ICD_FILENAMES", false, DEFAULT_VK_DRIVERS_INFO,
                               &manifest_files);
@@ -1370,7 +1367,6 @@ void layer_lib_scan(void)
     } // for (libpaths)
 
     loader.scanned_layer_count = count;
-    loader.layers_scanned = true;
 }
 
 static void* VKAPI loader_gpa_instance_internal(VkInstance inst, const char * pName)
diff --git a/loader/loader.h b/loader/loader.h
index a854485a..c89ad0fe 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -234,9 +234,7 @@ struct loader_lib_info {
 
 struct loader_struct {
     struct loader_instance *instances;
-    bool icds_scanned;
     struct loader_scanned_icds *scanned_icd_list;
-    bool layers_scanned;
 
     unsigned int loaded_layer_lib_count;
     struct loader_lib_info *loaded_layer_lib_list;
-- 
cgit v1.2.3