Merge "Add VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT to FP16 surface" into main

HuYuxin · Android (Google) Code Review · commit a107648d88ad · 2024-02-09T02:52:00.000Z
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "vulkan/vulkan_core.h"
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
 #include <aidl/android/hardware/graphics/common/Dataspace.h>
@@ -789,6 +790,9 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,
             all_formats.emplace_back(
                 VkSurfaceFormatKHR{VK_FORMAT_R16G16B16A16_SFLOAT,
                                    VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT});
+            all_formats.emplace_back(
+                VkSurfaceFormatKHR{VK_FORMAT_R16G16B16A16_SFLOAT,
+                                   VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT});
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
	`17`	`+#include "vulkan/vulkan_core.h"`
`17`	`18`	`#define ATRACE_TAG ATRACE_TAG_GRAPHICS`
`18`	`19`
`19`	`20`	`#include <aidl/android/hardware/graphics/common/Dataspace.h>`
`@@ -789,6 +790,9 @@ VkResult GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice pdev,`
`789`	`790`	`all_formats.emplace_back(`
`790`	`791`	`VkSurfaceFormatKHR{VK_FORMAT_R16G16B16A16_SFLOAT,`
`791`	`792`	`VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT});`
	`793`	`+ all_formats.emplace_back(`
	`794`	`+ VkSurfaceFormatKHR{VK_FORMAT_R16G16B16A16_SFLOAT,`
	`795`	`+ VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT});`
`792`	`796`	`}`
`793`	`797`	`}`
`794`	`798`