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

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

Update color space names to match extension 

Test: make
Change-Id: Ia692a5fdc466a28c55cf0898cb0ea0bcca06aece
parent e278daf8

vulkan/include/vulkan/vulkan.h

+11 −10
Original line number Diff line number Diff line
@@ -3218,18 +3218,19 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR) 


typedef enum VkColorSpaceKHR {

    VK_COLOR_SPACE_SRGB_NONLINEAR_KHR = 0,

    VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT = 1000104001,

    VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT = 1000104002,

    VK_COLOR_SPACE_SCRGB_LINEAR_EXT = 1000104003,

    VK_COLOR_SPACE_SCRGB_NONLINEAR_EXT = 1000104004,

    VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = 1000104005,

    VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT = 1000104006,

    VK_COLOR_SPACE_BT709_LINEAR_EXT = 1000104007,

    VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104008,

    VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104009,

    VK_COLOR_SPACE_BT2020_NONLINEAR_EXT = 1000104010,

    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_ADOBERGB_LINEAR_EXT = 1000104011,

    VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT = 1000104012,

    VK_COLOR_SPACE_PASS_THROUGH_EXT = 1000104013,

    VK_COLOR_SPACE_BEGIN_RANGE_KHR = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,

    VK_COLOR_SPACE_END_RANGE_KHR = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,

    VK_COLOR_SPACE_RANGE_SIZE_KHR = (VK_COLOR_SPACE_SRGB_NONLINEAR_KHR - VK_COLOR_SPACE_SRGB_NONLINEAR_KHR + 1),

vulkan/libvulkan/swapchain.cpp

+2 −1
Original line number Diff line number Diff line
@@ -546,7 +546,8 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
        instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);



    const VkSurfaceFormatKHR kWideColorFormats[] = {

        {VK_FORMAT_R16G16B16A16_SFLOAT, VK_COLOR_SPACE_SCRGB_LINEAR_EXT},

        {VK_FORMAT_R16G16B16A16_SFLOAT,

         VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT},

        {VK_FORMAT_A2R10G10B10_UNORM_PACK32,

         VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},

    };