diff options
| author | 2017-08-02 18:54:51 +0000 | |
|---|---|---|
| committer | 2017-08-02 18:54:51 +0000 | |
| commit | e124f74dff97dfd178babd6e857a06e23e1d3394 (patch) | |
| tree | 3aeb49eb7b208e5fa7f7758729fdbb0f9e9df6f8 /vulkan | |
| parent | 146c41fa7ebde27ab9b25dc8182425e4996fa937 (diff) | |
| parent | ddd9c712727881acbedec8a66535ab31fa2a5b4f (diff) | |
Merge changes If4271719,I9c9b5de9,I46a26a67 into oc-dr1-dev
am: ddd9c71272
Change-Id: I842bfeea8bea812f2ff2adb87387fc129bcb68c3
Diffstat (limited to 'vulkan')
| -rw-r--r-- | vulkan/api/vulkan.api | 1 | ||||
| -rw-r--r-- | vulkan/include/vulkan/vulkan.h | 3 | ||||
| -rw-r--r-- | vulkan/libvulkan/swapchain.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api index 0b390171ae..52c0b51736 100644 --- a/vulkan/api/vulkan.api +++ b/vulkan/api/vulkan.api @@ -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 diff --git a/vulkan/include/vulkan/vulkan.h b/vulkan/include/vulkan/vulkan.h index e28f7a704f..4e7c2fc7d5 100644 --- a/vulkan/include/vulkan/vulkan.h +++ b/vulkan/include/vulkan/vulkan.h @@ -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" diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index 651438d6c8..069fb36fd0 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp @@ -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}, }; |