From c45673f8f14ecbcf49683ef7dd62dd4123a57fe5 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Mon, 13 Mar 2017 15:58:15 -0600 Subject: [PATCH] Update extension enums to match upstream. Test: make Change-Id: I0c48e3d7112ed009c088b0336fd974ee0dd22afe --- vulkan/include/vulkan/vulkan.h | 16 ++++++++-------- vulkan/libvulkan/swapchain.cpp | 16 ++++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/vulkan/include/vulkan/vulkan.h b/vulkan/include/vulkan/vulkan.h index 22939606e9..4b3b8bf984 100644 --- a/vulkan/include/vulkan/vulkan.h +++ b/vulkan/include/vulkan/vulkan.h @@ -3306,14 +3306,14 @@ typedef enum VkColorSpaceKHR { VK_COLOR_SPACE_SRGB_NONLINEAR_KHR = 0, VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT = 1000104001, VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT = 1000104002, - VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT = 1000104003, - VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = 1000104004, - VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT = 1000104005, - VK_COLOR_SPACE_BT709_LINEAR_EXT = 1000104006, - VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104007, - VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104008, - VK_COLOR_SPACE_BT2020_170M_EXT = 1000104009, - VK_COLOR_SPACE_BT2020_ST2084_EXT = 1000104010, + VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = 1000104003, + VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT = 1000104004, + VK_COLOR_SPACE_BT709_LINEAR_EXT = 1000104005, + VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104006, + VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104007, + VK_COLOR_SPACE_HDR10_ST2084_EXT = 1000104008, + VK_COLOR_SPACE_DOLBYVISION_EXT = 1000104009, + VK_COLOR_SPACE_HDR10_HLG_EXT = 1000104010, VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT = 1000104011, VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT = 1000104012, VK_COLOR_SPACE_PASS_THROUGH_EXT = 1000104013, diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index b24bc1bc28..f7695ea8d0 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp @@ -411,8 +411,6 @@ android_dataspace GetNativeDataspace(VkColorSpaceKHR colorspace) { return HAL_DATASPACE_DISPLAY_P3; case VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT: return HAL_DATASPACE_V0_SCRGB_LINEAR; - case VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT: - return HAL_DATASPACE_V0_SCRGB; case VK_COLOR_SPACE_DCI_P3_LINEAR_EXT: return HAL_DATASPACE_DCI_P3_LINEAR; case VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT: @@ -421,14 +419,20 @@ android_dataspace GetNativeDataspace(VkColorSpaceKHR colorspace) { return HAL_DATASPACE_V0_SRGB_LINEAR; case VK_COLOR_SPACE_BT709_NONLINEAR_EXT: return HAL_DATASPACE_V0_SRGB; - case VK_COLOR_SPACE_BT2020_170M_EXT: + case VK_COLOR_SPACE_BT2020_LINEAR_EXT: + return HAL_DATASPACE_BT2020_LINEAR; + case VK_COLOR_SPACE_HDR10_ST2084_EXT: return static_cast( - HAL_DATASPACE_STANDARD_BT2020 | - HAL_DATASPACE_TRANSFER_SMPTE_170M | HAL_DATASPACE_RANGE_FULL); - case VK_COLOR_SPACE_BT2020_ST2084_EXT: + HAL_DATASPACE_STANDARD_BT2020 | HAL_DATASPACE_TRANSFER_ST2084 | + HAL_DATASPACE_RANGE_FULL); + case VK_COLOR_SPACE_DOLBYVISION_EXT: return static_cast( HAL_DATASPACE_STANDARD_BT2020 | HAL_DATASPACE_TRANSFER_ST2084 | HAL_DATASPACE_RANGE_FULL); + case VK_COLOR_SPACE_HDR10_HLG_EXT: + return static_cast( + HAL_DATASPACE_STANDARD_BT2020 | HAL_DATASPACE_TRANSFER_HLG | + HAL_DATASPACE_RANGE_FULL); case VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT: return static_cast( HAL_DATASPACE_STANDARD_ADOBE_RGB | -- 2.11.0