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

Commit 1e19f272 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter Committed by Android (Google) Code Review
Browse files

Merge "Add VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT."

parents 1bba8245 edc88e78

vulkan/api/vulkan.api

+1 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,7 @@ enum VkColorSpaceKHR { 
    VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT                      = 1000104011,

    VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT                   = 1000104012,

    VK_COLOR_SPACE_PASS_THROUGH_EXT                         = 1000104013,

    VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT              = 1000104014,

}



@extension("VK_EXT_debug_report") // 12

vulkan/include/vulkan/vulkan.h

+2 −1
Original line number Diff line number Diff line
@@ -3412,6 +3412,7 @@ typedef enum VkColorSpaceKHR { 
    VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT = 1000104011,

    VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT = 1000104012,

    VK_COLOR_SPACE_PASS_THROUGH_EXT = 1000104013,

    VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT = 1000104014,

    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),
@@ -5891,7 +5892,7 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetDiscardRectangleEXT( 
#endif



#define VK_EXT_swapchain_colorspace 1

#define VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION 2

#define VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION 3

#define VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME "VK_EXT_swapchain_colorspace"

vulkan/libvulkan/swapchain.cpp

+2 −0
Original line number Diff line number Diff line
@@ -640,6 +640,8 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev, 
    const VkSurfaceFormatKHR kWideColorFormats[] = {

        {VK_FORMAT_R16G16B16A16_SFLOAT,

         VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT},

        {VK_FORMAT_R16G16B16A16_SFLOAT,

         VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT},

        {VK_FORMAT_A2R10G10B10_UNORM_PACK32,

         VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT},

    };