diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-05-28 19:16:58 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-18 10:18:20 -0600 |
| commit | 18fd05b1dc9ea0424d646e4dd6cb230fc386eadf (patch) | |
| tree | f8d8a839a008b76b9b8127366fb3e5608c305a83 /loader/loader.h | |
| parent | fd21d36c9c2eb1a207ce706ea8cb5ad55d8ef3ac (diff) | |
| download | usermoji-18fd05b1dc9ea0424d646e4dd6cb230fc386eadf.tar.xz | |
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.
Diffstat (limited to 'loader/loader.h')
| -rw-r--r-- | loader/loader.h | 5 |
1 files changed, 2 insertions, 3 deletions
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); |