diff options
| author | Cort Stratton <cort@google.com> | 2018-05-03 13:42:10 -0400 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2018-05-04 06:59:34 -0600 |
| commit | 15206477a12149a175f2c1ca8e635692bdd3c8df (patch) | |
| tree | 5c5889db5061ecdd0ae0bcb14f0b727ea648009e | |
| parent | 7d0a35f954be4e71ddd39eb03fb49ec4d8426b81 (diff) | |
| download | usermoji-15206477a12149a175f2c1ca8e635692bdd3c8df.tar.xz | |
layers: remove duplicate GetEnabledExtensions() function
| -rw-r--r-- | layers/core_validation.cpp | 2 | ||||
| -rw-r--r-- | layers/shader_validation.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 30b10b52..ca854df8 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -362,8 +362,6 @@ SURFACE_STATE *GetSurfaceState(instance_layer_data *instance_data, VkSurfaceKHR return &it->second; } -DeviceExtensions const *GetEnabledExtensions(layer_data const *dev_data) { return &dev_data->extensions; } - // Return ptr to memory binding for given handle of specified type static BINDABLE *GetObjectMemBinding(layer_data *dev_data, uint64_t handle, VulkanObjectType type) { switch (type) { diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp index 2943044a..0c725e95 100644 --- a/layers/shader_validation.cpp +++ b/layers/shader_validation.cpp @@ -1195,7 +1195,7 @@ static bool validate_shader_capabilities(layer_data *dev_data, shader_module con auto report_data = GetReportData(dev_data); auto const &enabledFeatures = GetEnabledFeatures(dev_data); - auto const &extensions = GetEnabledExtensions(dev_data); + auto const &extensions = GetDeviceExtensions(dev_data); auto const &descriptorIndexingFeatures = GetEnabledDescriptorIndexingFeatures(dev_data); struct CapabilityInfo { @@ -1686,7 +1686,7 @@ bool PreCallValidateCreateShaderModule(layer_data *dev_data, VkShaderModuleCreat return false; } - auto have_glsl_shader = GetEnabledExtensions(dev_data)->vk_nv_glsl_shader; + auto have_glsl_shader = GetDeviceExtensions(dev_data)->vk_nv_glsl_shader; if (!have_glsl_shader && (pCreateInfo->codeSize % 4)) { skip |= log_msg( |