Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c45673f8 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Update extension enums to match upstream. 

Test: make
Change-Id: I0c48e3d7112ed009c088b0336fd974ee0dd22afe
parent 62ef044d

vulkan/include/vulkan/vulkan.h

+8 −8
Original line number Diff line number Diff line
@@ -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,

vulkan/libvulkan/swapchain.cpp

+10 −6
Original line number Diff line number Diff line
@@ -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<android_dataspace>(

                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<android_dataspace>(

                HAL_DATASPACE_STANDARD_BT2020 | HAL_DATASPACE_TRANSFER_ST2084 |

                HAL_DATASPACE_RANGE_FULL);

        case VK_COLOR_SPACE_HDR10_HLG_EXT:

            return static_cast<android_dataspace>(

                HAL_DATASPACE_STANDARD_BT2020 | HAL_DATASPACE_TRANSFER_HLG |

                HAL_DATASPACE_RANGE_FULL);

        case VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT:

            return static_cast<android_dataspace>(

                HAL_DATASPACE_STANDARD_ADOBE_RGB |