diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-02-03 12:07:43 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-02-06 09:26:34 -0700 |
| commit | e6390f6c31ba3033e24d942e2da23bbf6bae5afc (patch) | |
| tree | 2f0d505befe7951ea6da9783c9529268fe71de50 /layers/core_validation.cpp | |
| parent | 9d8b7445333cf528ccf7b40a419c640cb8229f98 (diff) | |
| download | usermoji-e6390f6c31ba3033e24d942e2da23bbf6bae5afc.tar.xz | |
layers: Add enable for NV_GLSL_SHADER extension
Change-Id: Iffe21dd329c253878b9c2db0ceaf2e8f62679703
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 6ad03c40..e23e1d0c 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -102,6 +102,7 @@ static const uint32_t kSurfaceSizeFromSwapchain = 0xFFFFFFFFu; struct devExts { bool wsi_enabled; bool wsi_display_swapchain_enabled; + bool nv_glsl_shader_enabled; unordered_map<VkSwapchainKHR, unique_ptr<SWAPCHAIN_NODE>> swapchainMap; unordered_map<VkImage, VkSwapchainKHR> imageToSwapchainMap; }; @@ -3871,17 +3872,22 @@ VKAPI_ATTR void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocati static void checkDeviceRegisterExtensions(const VkDeviceCreateInfo *pCreateInfo, VkDevice device) { uint32_t i; - // TBD: Need any locking, in case this function is called at the same time - // by more than one thread? + // TBD: Need any locking, in case this function is called at the same time by more than one thread? layer_data *dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); dev_data->device_extensions.wsi_enabled = false; dev_data->device_extensions.wsi_display_swapchain_enabled = false; + dev_data->device_extensions.nv_glsl_shader_enabled = false; for (i = 0; i < pCreateInfo->enabledExtensionCount; i++) { - if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) + if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) { dev_data->device_extensions.wsi_enabled = true; - if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME) == 0) + } + if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME) == 0) { dev_data->device_extensions.wsi_display_swapchain_enabled = true; + } + if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NV_GLSL_SHADER_EXTENSION_NAME) == 0) { + dev_data->device_extensions.nv_glsl_shader_enabled = true; + } } } |