commit d05402ff3286fbcd16688a8e4e7c1cce3ad48f64
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 15 22:50:27 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 15 22:50:28 2017 +0000
tree 4b1e78366588ae98d651cbb39f6f69e57ff744a3
parent 9f02435fd44c0651c85e9bd4dc7307bc6b1a85fa
parent fe8543b0b5231e45bd435efcd8184745fe91d021

Merge "Revert "Temporarily disable enumeration of VK_KHR_incremental_present""

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index a23056c..32f777d 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -739,10 +739,8 @@
     const InstanceData& data = GetData(physicalDevice);
     static const std::array<VkExtensionProperties, 2> loader_extensions = {{
         // WSI extensions
-#if 0 // Remove this "#if 0" once the VK_KHR_incremental_present extension is ratified
         {VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME,
          VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION},
-#endif
         {VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME,
          VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION},
     }};