Merge "Add conditional BT709 support to the vulkan swapchain" (cba1c577) · Commits · e / os / android_frameworks_native

vulkan/libvulkan/swapchain.cpp

+7 −2

Original line number	Diff line number	Diff line
		@@ -714,7 +714,7 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,

		bool wide_color_support = false;
		uint64_t consumer_usage = 0;
		bool swapchain_ext =
		bool colorspace_ext =
		instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);
		if (surface_handle == VK_NULL_HANDLE) {
		ProcHook::Extension surfaceless = ProcHook::GOOGLE_surfaceless_query;
		@@ -743,7 +743,7 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,

		consumer_usage = surface.consumer_usage;
		}
		wide_color_support = wide_color_support && swapchain_ext;
		wide_color_support = wide_color_support && colorspace_ext;

		AHardwareBuffer_Desc desc = {};
		desc.width = 1;
		@@ -757,6 +757,11 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,
		{VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR},
		{VK_FORMAT_R8G8B8A8_SRGB, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR}};

		if (colorspace_ext) {
		all_formats.emplace_back(VkSurfaceFormatKHR{
		VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_BT709_LINEAR_EXT});
		}

		if (wide_color_support) {
		all_formats.emplace_back(VkSurfaceFormatKHR{
		VK_FORMAT_R8G8B8A8_UNORM, VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT});