commit 544def7c131ab93a02e7bc68ec1a74a7491325bc
author Mark Lobodzinski <mark@lunarg.com> Fri Apr 19 14:25:59 2019 -0600
committer Mark Lobodzinski <mark@lunarg.com> Tue Apr 23 08:46:22 2019 -0600
tree c7150b19da4313f2e42f78254e541499fe507066
parent d7b03cc3f94e443dc1fea38fc97c6b82be77540c

corechecks: Remove GetApiVersion helper

Change-Id: I5530276233d46ac6002ad7d0c4edd9c404fbf565

layers/shader_validation.cpp

diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp
index 3334a31..3389810 100644
--- a/layers/shader_validation.cpp
+++ b/layers/shader_validation.cpp
@@ -2712,7 +2712,7 @@
 
         // Use SPIRV-Tools validator to try and catch any issues with the module itself
         spv_target_env spirv_environment = SPV_ENV_VULKAN_1_0;
-        if (GetApiVersion() >= VK_API_VERSION_1_1) {
+        if (api_version >= VK_API_VERSION_1_1) {
             spirv_environment = SPV_ENV_VULKAN_1_1;
         }
         spv_context ctx = spvContextCreate(spirv_environment);
@@ -2764,7 +2764,7 @@
     if (VK_SUCCESS != result) return;
     create_shader_module_api_state *csm_state = reinterpret_cast<create_shader_module_api_state *>(csm_state_data);
 
-    spv_target_env spirv_environment = ((GetApiVersion() >= VK_API_VERSION_1_1) ? SPV_ENV_VULKAN_1_1 : SPV_ENV_VULKAN_1_0);
+    spv_target_env spirv_environment = ((api_version >= VK_API_VERSION_1_1) ? SPV_ENV_VULKAN_1_1 : SPV_ENV_VULKAN_1_0);
     bool is_spirv = (pCreateInfo->pCode[0] == spv::MagicNumber);
     std::unique_ptr<shader_module> new_shader_module(
         is_spirv ? new shader_module(pCreateInfo, *pShaderModule, spirv_environment, csm_state->unique_shader_id)