Temporarily disable 2 unratified Khronos extensions. (e9121442) · Commits · e / devices / smdk4412 / android_frameworks_native

vulkan/libvulkan/driver.cpp

+30 −17

Original line number	Diff line number	Diff line
		@@ -34,6 +34,9 @@
		#include "driver.h"
		#include "stubhal.h"

		// 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>
		@@ -675,16 +678,24 @@ VkResult EnumerateInstanceExtensionProperties(
		const char* pLayerName,
		uint32_t* pPropertyCount,
		VkExtensionProperties* pProperties) {
		static const std::array<VkExtensionProperties, 4> loader_extensions = {{
		// WSI extensions
		{VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION},
		{VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
		VK_KHR_ANDROID_SURFACE_SPEC_VERSION},
		{VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME,
		VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION},
		{VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME,
		VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION},
		}};

		android::Vector<VkExtensionProperties> loader_extensions;
		loader_extensions.push_back({
		VK_KHR_SURFACE_EXTENSION_NAME,
		VK_KHR_SURFACE_SPEC_VERSION});
		loader_extensions.push_back({
		VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
		VK_KHR_ANDROID_SURFACE_SPEC_VERSION});
		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});
		}

		static const VkExtensionProperties loader_debug_report_extension = {
		VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION,
		};
		@@ -782,6 +793,7 @@ VkResult EnumerateDeviceExtensionProperties(
		VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME,
		VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION});

		if (kEnableUnratifiedExtensions) {
		// conditionally add shared_presentable_image if supportable
		VkPhysicalDevicePresentationPropertiesANDROID presentation_properties;
		if (QueryPresentationProperties(physicalDevice, &presentation_properties) &&
		@@ -790,6 +802,7 @@ VkResult EnumerateDeviceExtensionProperties(
		VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME,
		VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION});
		}
		}

		// enumerate our extensions first
		if (!pLayerName && pProperties) {