diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-06-27 15:14:12 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-06-29 13:52:13 -0600 |
| commit | 6cea77373058f62d7bb1079d6694b48c5d6b4039 (patch) | |
| tree | 293dba1df7361381642106c5c41bf8a1b0143f90 /layers/core_validation.cpp | |
| parent | 7edef26a63efa90b95bf0565e91b2b66e75d4afe (diff) | |
| download | usermoji-6cea77373058f62d7bb1079d6694b48c5d6b4039.tar.xz | |
layers: Move phys dev call state structs to CV
Change-Id: I92faf07ea2e47d2013bb206e04de26081049f79f
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index e8d8e748..acecb50a 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -105,6 +105,8 @@ struct shader_module; // TODO : Split this into separate structs for instance and device level data? struct layer_data { VkInstance instance; + unique_ptr<INSTANCE_STATE> instance_state; + debug_report_data *report_data; std::vector<VkDebugReportCallbackEXT> logging_callback; @@ -145,10 +147,11 @@ struct layer_data { // Device specific data PHYS_DEV_PROPERTIES_NODE phys_dev_properties; VkPhysicalDeviceMemoryProperties phys_dev_mem_props; + unique_ptr<PHYSICAL_DEVICE_STATE> physicalDeviceState; layer_data() - : report_data(nullptr), device_dispatch_table(nullptr), instance_dispatch_table(nullptr), device_extensions(), - device(VK_NULL_HANDLE), phys_dev_properties{}, phys_dev_mem_props{} {}; + : instance_state(nullptr), report_data(nullptr), device_dispatch_table(nullptr), instance_dispatch_table(nullptr), + device_extensions(), device(VK_NULL_HANDLE), phys_dev_properties{}, phys_dev_mem_props{}, physicalDeviceState(nullptr){}; }; // TODO : Do we need to guard access to layer_data_map w/ lock? @@ -3939,7 +3942,7 @@ CreateInstance(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallba pCreateInfo->ppEnabledExtensionNames); init_core_validation(instance_data, pAllocator); - + instance_data->instance_state = unique_ptr<INSTANCE_STATE>(new INSTANCE_STATE()); ValidateLayerOrdering(*pCreateInfo); return result; |