diff options
| author | Stenzek <stenzek@gmail.com> | 2017-09-03 15:30:52 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2017-09-03 15:31:19 +1000 |
| commit | 254160691a1944db5199191e43ed5c5947059018 (patch) | |
| tree | 6407ed57a50cbdcd03c2654be97ddbb7dce1c284 /Source/Core/VideoBackends/Vulkan/VulkanContext.cpp | |
| parent | ce59121748695118c5cc4e010cdd84449d16911c (diff) | |
Revert "Vulkan: Use VK_NV_glsl extension where available, and skip glslang"
This reverts commit d23fd17e1a2c7c617731d619020af021a7658e93.
Dynamic sampler indexing is broken in VK_NV_glsl as of 385.41. The
performance gap doesn't seem to be as wide with the updated driver, so
to save maintaining two code paths, it's easier to just drop the
extension support completely.
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/VulkanContext.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/VulkanContext.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp index 8bb7a5088e..e80e391305 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp @@ -402,8 +402,7 @@ bool VulkanContext::SelectDeviceExtensions(ExtensionList* extension_list, bool e for (const auto& extension_properties : available_extension_list) INFO_LOG(VIDEO, "Available extension: %s", extension_properties.extensionName); - auto CheckForExtension = [&](const char* name, bool required, - bool* has_extension = nullptr) -> bool { + auto CheckForExtension = [&](const char* name, bool required) -> bool { if (std::find_if(available_extension_list.begin(), available_extension_list.end(), [&](const VkExtensionProperties& properties) { return !strcmp(name, properties.extensionName); @@ -411,14 +410,9 @@ bool VulkanContext::SelectDeviceExtensions(ExtensionList* extension_list, bool e { INFO_LOG(VIDEO, "Enabling extension: %s", name); extension_list->push_back(name); - if (has_extension) - *has_extension = true; return true; } - if (has_extension) - *has_extension = false; - if (required) { ERROR_LOG(VIDEO, "Vulkan: Missing required extension %s.", name); @@ -431,7 +425,6 @@ bool VulkanContext::SelectDeviceExtensions(ExtensionList* extension_list, bool e if (enable_surface && !CheckForExtension(VK_KHR_SWAPCHAIN_EXTENSION_NAME, true)) return false; - CheckForExtension(VK_NV_GLSL_SHADER_EXTENSION_NAME, false, &m_supports_nv_glsl_extension); return true; } |
