From 18fd05b1dc9ea0424d646e4dd6cb230fc386eadf Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Thu, 28 May 2015 19:16:58 -0600
Subject: loader: Fix EnumeratePhysDev to handle less gpus than icd has and no
 mem leak

Also no longer wrap gpu objs of inst objs in CreateInstance.
---
 loader/loader.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'loader/loader.h')

diff --git a/loader/loader.h b/loader/loader.h
index 0e62ec6e..0c16530a 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -99,7 +99,7 @@ struct loader_icd {
     uint32_t layer_count[MAX_GPUS_FOR_LAYER];
     VkBaseLayerObject *wrappedGpus[MAX_GPUS_FOR_LAYER];
     uint32_t gpu_count;
-    VkBaseLayerObject *gpus;
+    VkPhysicalDevice *gpus;
     VkInstance instance;       // instance object from the icd
     PFN_vkGetDeviceProcAddr GetDeviceProcAddr;
     PFN_vkDestroyInstance DestroyInstance;
@@ -131,7 +131,6 @@ struct loader_instance {
 
     uint32_t layer_count;
 //    struct loader_layers layer_libs[MAX_LAYER_LIBRARIES];
-    VkBaseLayerObject *wrappedInstance;
     uint32_t total_gpu_count;
     uint32_t total_icd_count;
     struct loader_icd *icds;
@@ -361,7 +360,7 @@ void loader_icd_scan(void);
 void layer_lib_scan(void);
 void loader_coalesce_extensions(void);
 
-struct loader_icd * loader_get_icd(const VkBaseLayerObject *gpu,
+struct loader_icd * loader_get_icd(const VkPhysicalDevice gpu,
                                    uint32_t *gpu_index);
 uint32_t loader_activate_instance_layers(struct loader_instance *inst);
 void loader_activate_instance_layer_extensions(struct loader_instance *inst);
-- 
cgit v1.2.3