diff options
| author | Chris Forbes <chrisforbes@google.com> | 2017-05-17 21:49:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-17 21:49:54 +0000 |
| commit | 135fcf3780916246ddbcb182f5d2c689205147e0 (patch) | |
| tree | 5f00ad4e3281eb526b9df5fa62324f9ecccee4fc /vulkan | |
| parent | 476ad5a7904ac54d7be94f86c20fa150565971c8 (diff) | |
| parent | c4edc50adb2cec91e7b1c5c5b4ed2f26a2a83d2e (diff) | |
| download | native-135fcf3780916246ddbcb182f5d2c689205147e0.tar.gz | |
Merge "libvulkan: Enable GSC2 and SPI extensions" into oc-dev am: d69b9d0e87
am: c4edc50adb
Change-Id: I91b510a1b9553ca25853a7a370fddb40f39e4221
Diffstat (limited to 'vulkan')
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index a8693174bd..7b985d1a7f 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -39,9 +39,6 @@ extern "C" { android_namespace_t* android_get_exported_namespace(const char*); } -// Set to true to enable exposing unratified extensions for development -static const bool kEnableUnratifiedExtensions = false; - // #define ENABLE_ALLOC_CALLSTACKS 1 #if ENABLE_ALLOC_CALLSTACKS #include <utils/CallStack.h> @@ -717,12 +714,9 @@ VkResult EnumerateInstanceExtensionProperties( loader_extensions.push_back({ VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME, VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION}); - - if (kEnableUnratifiedExtensions) { - loader_extensions.push_back({ - VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, - VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION}); - } + loader_extensions.push_back({ + VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, + VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION}); static const VkExtensionProperties loader_debug_report_extension = { VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION, @@ -818,15 +812,12 @@ VkResult EnumerateDeviceExtensionProperties( VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME, VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION}); - if (kEnableUnratifiedExtensions) { - // conditionally add shared_presentable_image if supportable - VkPhysicalDevicePresentationPropertiesANDROID presentation_properties; - if (QueryPresentationProperties(physicalDevice, &presentation_properties) && - presentation_properties.sharedImage) { - loader_extensions.push_back({ - VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME, - VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION}); - } + VkPhysicalDevicePresentationPropertiesANDROID presentation_properties; + if (QueryPresentationProperties(physicalDevice, &presentation_properties) && + presentation_properties.sharedImage) { + loader_extensions.push_back({ + VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME, + VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION}); } // conditionally add VK_GOOGLE_display_timing if present timestamps are |