Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc |
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc |
index 63ce0c783c8488cdde92f3bbf8ce9d046bf8df43..9d84b589e942dcbb55a2f86daf315a63c8a0f872 100644 |
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc |
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc |
@@ -5,16 +5,13 @@ |
#include "content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h" |
#include "ui/gl/gl_image_ozone_native_pixmap.h" |
+#include "ui/ozone/public/native_pixmap_manager.h" |
#include "ui/ozone/public/ozone_platform.h" |
#include "ui/ozone/public/surface_factory_ozone.h" |
namespace content { |
namespace { |
-const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = { |
- {gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::SCANOUT}, |
- {gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT}}; |
- |
ui::SurfaceFactoryOzone::BufferFormat GetOzoneFormatFor( |
gfx::GpuMemoryBuffer::Format format) { |
switch (format) { |
@@ -54,6 +51,48 @@ ui::SurfaceFactoryOzone::BufferUsage GetOzoneUsageFor( |
return ui::SurfaceFactoryOzone::MAP; |
} |
+gfx::GpuMemoryBuffer::Format GetGpuMemoryBufferFormatFor( |
+ ui::SurfaceFactoryOzone::BufferFormat ozone_format) { |
+ switch (ozone_format) { |
+ case ui::SurfaceFactoryOzone::BGRA_8888: |
+ return gfx::GpuMemoryBuffer::BGRA_8888; |
+ case ui::SurfaceFactoryOzone::RGBX_8888: |
+ return gfx::GpuMemoryBuffer::RGBX_8888; |
+ case ui::SurfaceFactoryOzone::UNKNOWN: |
+ NOTREACHED(); |
+ break; |
+ } |
+ NOTREACHED(); |
+ return gfx::GpuMemoryBuffer::BGRA_8888; |
+} |
+ |
+gfx::GpuMemoryBuffer::Usage GetGpuMemoryBufferUsageFor( |
+ ui::SurfaceFactoryOzone::BufferUsage ozone_usage) { |
+ switch (ozone_usage) { |
+ case ui::SurfaceFactoryOzone::MAP: |
+ return gfx::GpuMemoryBuffer::MAP; |
+ case ui::SurfaceFactoryOzone::PERSISTENT_MAP: |
+ return gfx::GpuMemoryBuffer::PERSISTENT_MAP; |
+ case ui::SurfaceFactoryOzone::SCANOUT: |
+ return gfx::GpuMemoryBuffer::SCANOUT; |
+ } |
+ NOTREACHED(); |
+ return gfx::GpuMemoryBuffer::MAP; |
+} |
+ |
+void GetSupportedConfigurations( |
+ std::vector<GpuMemoryBufferFactory::Configuration>* configurations) { |
+ std::vector<ui::NativePixmapManager::Configuration> |
+ native_pixmap_configurations = |
+ ui::NativePixmapManager::GetInstance() |
+ ->GetSupportedNativePixmapConfigurations(); |
+ for (auto& native_pixmap_configuration : native_pixmap_configurations) { |
+ configurations->push_back( |
+ {GetGpuMemoryBufferFormatFor(native_pixmap_configuration.format), |
+ GetGpuMemoryBufferUsageFor(native_pixmap_configuration.usage)}); |
+ } |
+} |
+ |
} // namespace |
GpuMemoryBufferFactoryOzoneNativePixmap:: |
@@ -66,7 +105,9 @@ GpuMemoryBufferFactoryOzoneNativePixmap:: |
bool GpuMemoryBufferFactoryOzoneNativePixmap:: |
IsGpuMemoryBufferConfigurationSupported(gfx::GpuMemoryBuffer::Format format, |
gfx::GpuMemoryBuffer::Usage usage) { |
- for (auto& configuration : kSupportedConfigurations) { |
+ std::vector<Configuration> configurations; |
+ GetSupportedConfigurations(&configurations); |
+ for (auto& configuration : configurations) { |
if (configuration.format == format && configuration.usage == usage) |
return true; |
} |
@@ -77,14 +118,7 @@ bool GpuMemoryBufferFactoryOzoneNativePixmap:: |
void GpuMemoryBufferFactoryOzoneNativePixmap:: |
GetSupportedGpuMemoryBufferConfigurations( |
std::vector<Configuration>* configurations) { |
- if (!ui::OzonePlatform::GetInstance() |
- ->GetSurfaceFactoryOzone() |
- ->CanCreateNativePixmap(ui::SurfaceFactoryOzone::SCANOUT)) |
- return; |
- |
- configurations->assign( |
- kSupportedConfigurations, |
- kSupportedConfigurations + arraysize(kSupportedConfigurations)); |
+ GetSupportedConfigurations(configurations); |
} |
gfx::GpuMemoryBufferHandle |