[gpu] Add GetMappableSharedImageFormatForTesting to SIF utils

Add GetMappableSharedImageFormatForTesting util method that returns
all mappable SIFormats similar to its BufferFormat equivalent
GetBufferFormatsForTesting that is now removed in this CL. This is
done as part of moving away from BufferFormat to SharedImageFormat.

Bug: 356649879
Change-Id: Ib35274eddfa58e1d9d76dbc65cd5e404332a0643
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7055704
Reviewed-by: Vasiliy Telezhnikov <[email protected]>
Commit-Queue: Saifuddin Hitawala <[email protected]>
Reviewed-by: Giovanni Ortuno Urquidi <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1532381}

Author: hitawala-chromium

components/viz/common/resources/shared_image_format_utils.cc

@@ -7,13 +7,29 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
+#include <array>
+
 #include "base/check_op.h"
 #include "base/logging.h"
 #include "base/notreached.h"
 #include "third_party/skia/include/core/SkColorType.h"
 #include "ui/gfx/buffer_types.h"
 
 namespace viz {
+namespace {
+
+constexpr auto kMappableSharedImageFormats = std::to_array<SharedImageFormat>(
+    {SinglePlaneFormat::kR_8, SinglePlaneFormat::kR_16,
+     SinglePlaneFormat::kRG_88, SinglePlaneFormat::kRG_1616,
+     SinglePlaneFormat::kBGR_565, SinglePlaneFormat::kRGBA_4444,
+     SinglePlaneFormat::kRGBX_8888, SinglePlaneFormat::kRGBA_8888,
+     SinglePlaneFormat::kBGRX_8888, SinglePlaneFormat::kBGRA_1010102,
+     SinglePlaneFormat::kRGBA_1010102, SinglePlaneFormat::kBGRA_8888,
+     SinglePlaneFormat::kRGBA_F16, MultiPlaneFormat::kNV12,
+     MultiPlaneFormat::kYV12, MultiPlaneFormat::kNV12A,
+     MultiPlaneFormat::kP010});
+
+}  // namespace
 
 SkColorType ToClosestSkColorType(SharedImageFormat format) {
   CHECK(format.is_single_plane());
@@ -350,6 +366,10 @@ bool IsOddSizeMultiPlanarBuffersAllowed() {
 #endif
 }
 
+base::span<const SharedImageFormat> GetMappableSharedImageFormatForTesting() {
+  return kMappableSharedImageFormats;
+}
+
 // static
 unsigned int
 SharedImageFormatRestrictedSinglePlaneUtils::ToGLTextureStorageFormat(

components/viz/common/resources/shared_image_format_utils.h

@@ -9,6 +9,7 @@
 #include "components/viz/common/resources/shared_image_format.h"
 
 namespace gpu {
+class GpuMemoryBufferSupport;
 class MappableBufferNativePixmap;
 class SharedImageFormatToBufferFormatRestrictedUtilsAccessor;
 class SharedImageFormatRestrictedUtilsAccessor;
@@ -113,6 +114,10 @@ std::optional<size_t> SharedMemorySizeForSharedImageFormat(
 COMPONENT_EXPORT(VIZ_SHARED_IMAGE_FORMAT)
 bool IsOddSizeMultiPlanarBuffersAllowed();
 
+// Returns a span containing all mappable SharedImageFormats.
+COMPONENT_EXPORT(VIZ_SHARED_IMAGE_FORMAT)
+base::span<const SharedImageFormat> GetMappableSharedImageFormatForTesting();
+
 // Utilities that conceptually belong only on the service side, but are
 // currently used by some clients. Usage is restricted to friended clients.
 class COMPONENT_EXPORT(VIZ_SHARED_IMAGE_FORMAT)
@@ -135,6 +140,7 @@ class COMPONENT_EXPORT(VIZ_SHARED_IMAGE_FORMAT)
 class COMPONENT_EXPORT(VIZ_SHARED_IMAGE_FORMAT)
     SharedImageFormatToBufferFormatRestrictedUtils {
  private:
+  friend class gpu::GpuMemoryBufferSupport;
   friend class gpu::SharedImageFormatToBufferFormatRestrictedUtilsAccessor;
   friend class gpu::MappableBufferNativePixmap;
   friend class ui::WaylandOverlayManager;

gpu/command_buffer/client/internal/mappable_buffer_test_template.h

@@ -187,7 +187,7 @@ TYPED_TEST_SUITE_P(MappableBufferTest);
 TYPED_TEST_P(MappableBufferTest, CreateFromHandle) {
   const gfx::Size kBufferSize(8, 8);
 
-  for (auto buffer_format : gfx::GetBufferFormatsForTesting()) {
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     gfx::BufferUsage usages[] = {
         gfx::BufferUsage::GPU_READ,
         gfx::BufferUsage::SCANOUT,
@@ -201,12 +201,11 @@ TYPED_TEST_P(MappableBufferTest, CreateFromHandle) {
         gfx::BufferUsage::SCANOUT_VEA_CPU_READ,
         gfx::BufferUsage::VEA_READ_CAMERA_AND_CPU_READ_WRITE,
     };
-    viz::SharedImageFormat format = viz::GetSharedImageFormat(buffer_format);
     for (auto usage : usages) {
       if (TypeParam::kBufferType != gfx::SHARED_MEMORY_BUFFER &&
           !TestFixture::gpu_memory_buffer_support()
                ->IsNativeGpuMemoryBufferConfigurationSupportedForTesting(
-                   buffer_format, usage)) {
+                   format, usage)) {
         continue;
       }
 
@@ -228,7 +227,7 @@ TYPED_TEST_P(MappableBufferTest, CreateFromHandle) {
 TYPED_TEST_P(MappableBufferTest, CreateFromHandleSmallBuffer) {
   const gfx::Size kBufferSize(8, 8);
 
-  for (auto buffer_format : gfx::GetBufferFormatsForTesting()) {
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     gfx::BufferUsage usages[] = {
         gfx::BufferUsage::GPU_READ,
         gfx::BufferUsage::SCANOUT,
@@ -242,12 +241,11 @@ TYPED_TEST_P(MappableBufferTest, CreateFromHandleSmallBuffer) {
         gfx::BufferUsage::SCANOUT_VEA_CPU_READ,
         gfx::BufferUsage::VEA_READ_CAMERA_AND_CPU_READ_WRITE,
     };
-    viz::SharedImageFormat format = viz::GetSharedImageFormat(buffer_format);
     for (auto usage : usages) {
       if (TypeParam::kBufferType != gfx::SHARED_MEMORY_BUFFER &&
           !TestFixture::gpu_memory_buffer_support()
                ->IsNativeGpuMemoryBufferConfigurationSupportedForTesting(
-                   buffer_format, usage)) {
+                   format, usage)) {
         continue;
       }
 
@@ -279,12 +277,11 @@ TYPED_TEST_P(MappableBufferTest, Map) {
   // Use a multiple of 4 for both dimensions to support compressed formats.
   const gfx::Size kBufferSize(4, 4);
 
-  for (auto buffer_format : gfx::GetBufferFormatsForTesting()) {
-    viz::SharedImageFormat format = viz::GetSharedImageFormat(buffer_format);
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     if (TypeParam::kBufferType != gfx::SHARED_MEMORY_BUFFER &&
         !TestFixture::gpu_memory_buffer_support()
              ->IsNativeGpuMemoryBufferConfigurationSupportedForTesting(
-                 buffer_format, gfx::BufferUsage::GPU_READ_CPU_READ_WRITE)) {
+                 format, gfx::BufferUsage::GPU_READ_CPU_READ_WRITE)) {
       continue;
     }
 
@@ -341,12 +338,11 @@ TYPED_TEST_P(MappableBufferTest, PersistentMap) {
   // Use a multiple of 4 for both dimensions to support compressed formats.
   const gfx::Size kBufferSize(4, 4);
 
-  for (auto buffer_format : gfx::GetBufferFormatsForTesting()) {
-    viz::SharedImageFormat format = viz::GetSharedImageFormat(buffer_format);
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     if (TypeParam::kBufferType != gfx::SHARED_MEMORY_BUFFER &&
         !TestFixture::gpu_memory_buffer_support()
              ->IsNativeGpuMemoryBufferConfigurationSupportedForTesting(
-                 buffer_format, gfx::BufferUsage::GPU_READ_CPU_READ_WRITE)) {
+                 format, gfx::BufferUsage::GPU_READ_CPU_READ_WRITE)) {
       continue;
     }
 
@@ -421,7 +417,7 @@ TYPED_TEST_P(MappableBufferTest, SerializeAndDeserialize) {
   const gfx::Size kBufferSize(8, 8);
   const gfx::GpuMemoryBufferType kBufferType = TypeParam::kBufferType;
 
-  for (auto buffer_format : gfx::GetBufferFormatsForTesting()) {
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     gfx::BufferUsage usages[] = {
         gfx::BufferUsage::GPU_READ,
         gfx::BufferUsage::SCANOUT,
@@ -435,12 +431,11 @@ TYPED_TEST_P(MappableBufferTest, SerializeAndDeserialize) {
         gfx::BufferUsage::SCANOUT_VEA_CPU_READ,
         gfx::BufferUsage::VEA_READ_CAMERA_AND_CPU_READ_WRITE,
     };
-    viz::SharedImageFormat format = viz::GetSharedImageFormat(buffer_format);
     for (auto usage : usages) {
       if (TypeParam::kBufferType != gfx::SHARED_MEMORY_BUFFER &&
           !TestFixture::gpu_memory_buffer_support()
                ->IsNativeGpuMemoryBufferConfigurationSupportedForTesting(
-                   buffer_format, usage)) {
+                   format, usage)) {
         continue;
       }
 

gpu/command_buffer/service/shared_image/d3d_image_backing_factory_unittest.cc

@@ -2556,7 +2556,7 @@ TEST_F(D3DImageBackingFactoryBufferTest, CreateSharedImageImportToDawn) {
 
 // Disabled by default as it requires DX11.
 TEST_F(D3DImageBackingFactoryTest, DISABLED_CreateGpuMemoryBuffer) {
-  for (auto format : gfx::GetBufferFormatsForTesting()) {
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     gfx::BufferUsage usages[] = {
         gfx::BufferUsage::GPU_READ,
         gfx::BufferUsage::SCANOUT,
@@ -2580,8 +2580,7 @@ TEST_F(D3DImageBackingFactoryTest, DISABLED_CreateGpuMemoryBuffer) {
 
       gfx::GpuMemoryBufferHandle handle =
           D3DImageBackingFactory::CreateGpuMemoryBufferHandle(
-              /*io_runner=*/nullptr, gfx::Size(2, 2),
-              viz::GetSharedImageFormat(format), usage);
+              /*io_runner=*/nullptr, gfx::Size(2, 2), format, usage);
       EXPECT_EQ(handle.type, gfx::DXGI_SHARED_HANDLE);
     }
   }

gpu/command_buffer/service/shared_image/iosurface_image_backing_factory_unittest.cc

@@ -185,7 +185,7 @@ TEST_F(IOSurfaceImageBackingFactoryTest, GL_SkiaGL) {
 }
 
 TEST_F(IOSurfaceImageBackingFactoryTest, CreateGpuMemoryBuffer) {
-  for (auto format : gfx::GetBufferFormatsForTesting()) {
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     if (!gpu::GpuMemoryBufferSupport::
             IsNativeGpuMemoryBufferConfigurationSupportedForTesting(
                 format, gfx::BufferUsage::GPU_READ)) {
@@ -194,7 +194,7 @@ TEST_F(IOSurfaceImageBackingFactoryTest, CreateGpuMemoryBuffer) {
 
     gfx::GpuMemoryBufferHandle handle =
         IOSurfaceImageBackingFactory::CreateGpuMemoryBufferHandle(
-            gfx::Size(2, 2), viz::GetSharedImageFormat(format));
+            gfx::Size(2, 2), format);
     EXPECT_EQ(handle.type, gfx::IO_SURFACE_BUFFER);
   }
 }

gpu/command_buffer/service/shared_image/ozone_image_backing_factory_unittest.cc

@@ -605,7 +605,7 @@ TEST_F(OzoneImageBackingFactoryTest, CorrectlyDestroysAndMarksContextLost) {
 }
 
 TEST_F(OzoneImageBackingFactoryTest, CreateGpuMemoryBufferHandle) {
-  for (auto format : gfx::GetBufferFormatsForTesting()) {
+  for (auto format : viz::GetMappableSharedImageFormatForTesting()) {
     gfx::BufferUsage usages[] = {
         gfx::BufferUsage::GPU_READ,
         gfx::BufferUsage::SCANOUT,
@@ -629,8 +629,8 @@ TEST_F(OzoneImageBackingFactoryTest, CreateGpuMemoryBufferHandle) {
 
       gfx::GpuMemoryBufferHandle handle =
           OzoneImageBackingFactory::CreateGpuMemoryBufferHandle(
-              /*vulkan_context_provider=*/nullptr, gfx::Size(2, 2),
-              viz::GetSharedImageFormat(format), usage);
+              /*vulkan_context_provider=*/nullptr, gfx::Size(2, 2), format,
+              usage);
       EXPECT_EQ(handle.type, gfx::NATIVE_PIXMAP);
     }
   }

gpu/ipc/common/gpu_memory_buffer_support.h

@@ -16,6 +16,7 @@
 #include "base/memory/unsafe_shared_memory_pool.h"
 #include "base/unguessable_token.h"
 #include "build/build_config.h"
+#include "components/viz/common/resources/shared_image_format_utils.h"
 #include "gpu/ipc/common/gpu_ipc_common_export.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/size.h"
@@ -55,9 +56,12 @@ class GPU_IPC_COMMON_EXPORT GpuMemoryBufferSupport {
 
   // Returns whether the provided buffer format is supported.
   static bool IsNativeGpuMemoryBufferConfigurationSupportedForTesting(
-      gfx::BufferFormat format,
+      viz::SharedImageFormat format,
       gfx::BufferUsage usage) {
-    return IsNativeGpuMemoryBufferConfigurationSupported(format, usage);
+    return IsNativeGpuMemoryBufferConfigurationSupported(
+        viz::SharedImageFormatToBufferFormatRestrictedUtils::ToBufferFormat(
+            format),
+        usage);
   }
 
  private:

ui/gfx/buffer_format_util.cc

@@ -7,29 +7,8 @@
 #include "base/check_op.h"
 #include "base/notreached.h"
 #include "base/types/cxx23_to_underlying.h"
-#include "ui/gfx/switches.h"
 
 namespace gfx {
-namespace {
-
-constexpr auto kBufferFormats = std::to_array<BufferFormat>(
-    {BufferFormat::R_8, BufferFormat::R_16, BufferFormat::RG_88,
-     BufferFormat::RG_1616, BufferFormat::BGR_565, BufferFormat::RGBA_4444,
-     BufferFormat::RGBX_8888, BufferFormat::RGBA_8888, BufferFormat::BGRX_8888,
-     BufferFormat::BGRA_1010102, BufferFormat::RGBA_1010102,
-     BufferFormat::BGRA_8888, BufferFormat::RGBA_F16,
-     BufferFormat::YUV_420_BIPLANAR, BufferFormat::YVU_420,
-     BufferFormat::YUVA_420_TRIPLANAR, BufferFormat::P010});
-
-static_assert(std::size(kBufferFormats) ==
-                  (static_cast<int>(BufferFormat::LAST) + 1),
-              "BufferFormat::LAST must be last value of kBufferFormats");
-
-}  // namespace
-
-base::span<const BufferFormat> GetBufferFormatsForTesting() {
-  return kBufferFormats;
-}
 
 const char* BufferFormatToString(BufferFormat format) {
   switch (format) {

ui/gfx/buffer_format_util.h

@@ -8,15 +8,10 @@
 #include <stddef.h>
 
 #include "base/component_export.h"
-#include "base/containers/span.h"
 #include "ui/gfx/buffer_types.h"
 
 namespace gfx {
 
-// Returns a span containing all buffer formats.
-COMPONENT_EXPORT(GFX)
-base::span<const BufferFormat> GetBufferFormatsForTesting();
-
 // Returns the name of |format| as a string.
 COMPONENT_EXPORT(GFX) const char* BufferFormatToString(BufferFormat format);