commit f45e45fc888b9f160069a64c1fbef839a0eeff96
author Mark Lobodzinski <mark@lunarg.com> Fri Apr 19 14:15:39 2019 -0600
committer Mark Lobodzinski <mark@lunarg.com> Tue Apr 23 08:46:22 2019 -0600
tree 211746525e25e90ed512cfbd4aba9ec14b9b0ee3
parent 1ee06e99016e276002682a36ce05b6896f4cfe7a

corechecks: Remove GetDeviceExtensions helper

Change-Id: Iee2dd338d831972583e074f07f3a42fd39282b88

layers/shader_validation.cpp

diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp
index 7027d20..156f276 100644
--- a/layers/shader_validation.cpp
+++ b/layers/shader_validation.cpp
@@ -1424,7 +1424,6 @@
     bool skip = false;
 
     auto const &features = GetEnabledFeatures();
-    auto const &extensions = GetDeviceExtensions();
 
     struct FeaturePointer {
         // Callable object to test if this feature is enabled in the given aggregate feature struct
@@ -1567,7 +1566,7 @@
                         skip |= RequireFeature(report_data, it->second.feature.IsEnabled(*features), it->second.name);
                     }
                     if (it->second.extension) {
-                        skip |= RequireExtension(report_data, extensions->*(it->second.extension), it->second.name);
+                        skip |= RequireExtension(report_data, device_extensions.*(it->second.extension), it->second.name);
                     }
                 }
             } else if (1 < n) {  // key occurs multiple times, at least one must be enabled
@@ -1585,7 +1584,7 @@
                     }
                     if (it->second.extension) {
                         needs_ext = true;
-                        has_ext = has_ext || extensions->*(it->second.extension);
+                        has_ext = has_ext || device_extensions.*(it->second.extension);
                         extension_names += it->second.name;
                         extension_names += " ";
                     }
@@ -2698,7 +2697,7 @@
         return false;
     }
 
-    auto have_glsl_shader = GetDeviceExtensions()->vk_nv_glsl_shader;
+    auto have_glsl_shader = device_extensions.vk_nv_glsl_shader;
 
     if (!have_glsl_shader && (pCreateInfo->codeSize % 4)) {
         skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0,
@@ -2722,10 +2721,10 @@
         spv_const_binary_t binary{pCreateInfo->pCode, pCreateInfo->codeSize / sizeof(uint32_t)};
         spv_diagnostic diag = nullptr;
         spv_validator_options options = spvValidatorOptionsCreate();
-        if (GetDeviceExtensions()->vk_khr_relaxed_block_layout) {
+        if (device_extensions.vk_khr_relaxed_block_layout) {
             spvValidatorOptionsSetRelaxBlockLayout(options, true);
         }
-        if (GetDeviceExtensions()->vk_ext_scalar_block_layout &&
+        if (device_extensions.vk_ext_scalar_block_layout &&
             GetEnabledFeatures()->scalar_block_layout_features.scalarBlockLayout == VK_TRUE) {
             spvValidatorOptionsSetScalarBlockLayout(options, true);
         }