| Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
|
| diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
|
| index 6185150e5cf71764ea4ffcef46548084ae8253e3..09d68a62236dae1495c35eb61faa6fb6bac4078d 100644
|
| --- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
|
| +++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
|
| @@ -12,8 +12,11 @@ namespace content {
|
| namespace {
|
|
|
| const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = {
|
| - { gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT },
|
| - { gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT }
|
| + {gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT},
|
| + {gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT},
|
| +#if defined(USE_OZONE_GBM_INTEL)
|
| + {gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::MAP}
|
| +#endif
|
| };
|
|
|
| } // namespace
|
| @@ -58,13 +61,13 @@ GpuMemoryBufferFactoryOzoneNativeBuffer::CreateGpuMemoryBuffer(
|
| gfx::GpuMemoryBuffer::Usage usage,
|
| int client_id,
|
| gfx::PluginWindowHandle surface_handle) {
|
| - if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer(
|
| - id, size, format, usage, client_id, surface_handle)) {
|
| - return gfx::GpuMemoryBufferHandle();
|
| - }
|
| gfx::GpuMemoryBufferHandle handle;
|
| handle.type = gfx::OZONE_NATIVE_BUFFER;
|
| handle.id = id;
|
| + if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer(
|
| + id, size, format, usage, client_id, surface_handle, &handle)) {
|
| + return gfx::GpuMemoryBufferHandle();
|
| + }
|
| return handle;
|
| }
|
|
|
|
|