ui: Add RGBX_8888 buffer format.

content/browser/gpu/browser_gpu_memory_buffer_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 123 matching lines @@
     for (auto& format : kNativeFormats) {
       for (auto& usage : kNativeUsages) {
         if (IsNativeGpuMemoryBufferFactoryConfigurationSupported(format, usage))
           configurations.insert(std::make_pair(format, usage));
       }
     }
   }
 
   if (force_native_scanout_formats) {
     const gfx::BufferFormat kScanoutFormats[] = {
-        gfx::BufferFormat::RGBA_8888, gfx::BufferFormat::BGRA_8888,
-        gfx::BufferFormat::BGRX_8888, gfx::BufferFormat::UYVY_422,
-        gfx::BufferFormat::YUV_420_BIPLANAR};
+        gfx::BufferFormat::RGBA_8888, gfx::BufferFormat::RGBX_8888,
+        gfx::BufferFormat::BGRA_8888, gfx::BufferFormat::BGRX_8888,
+        gfx::BufferFormat::UYVY_422,  gfx::BufferFormat::YUV_420_BIPLANAR};
     for (auto& format : kScanoutFormats) {
       if (IsNativeGpuMemoryBufferFactoryConfigurationSupported(
               format, gfx::BufferUsage::SCANOUT)) {
         configurations.insert(
             std::make_pair(format, gfx::BufferUsage::SCANOUT));
       }
     }
   }
 
   return configurations;
@@ skipping 147 matching lines @@
 
   // Use service side allocation for native configurations.
   if (IsNativeGpuMemoryBufferConfiguration(format, usage)) {
     CreateGpuMemoryBufferOnIO(base::Bind(&HostCreateGpuMemoryBuffer, 0), id,
                               size, format, usage, child_client_id, false,
                               callback);
     return;
   }
 
   // Early out if we cannot fallback to shared memory buffer.
-  if (!GpuMemoryBufferImplSharedMemory::IsFormatSupported(format) ||
-      !GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage) ||
+  if (!GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage) ||
       !GpuMemoryBufferImplSharedMemory::IsSizeValidForFormat(size, format)) {
     callback.Run(gfx::GpuMemoryBufferHandle());
     return;
   }
 
   BufferMap& buffers = clients_[child_client_id];
 
   // Allocate shared memory buffer as fallback.
   auto insert_result = buffers.insert(std::make_pair(
       id, BufferInfo(size, gfx::SHARED_MEMORY_BUFFER, format, usage, 0)));
@@ skipping 143 matching lines @@
     CreateGpuMemoryBufferOnIO(
         base::Bind(&HostCreateGpuMemoryBuffer, request->surface_id), new_id,
         request->size, request->format, request->usage, request->client_id,
         false,
         base::Bind(
             &BrowserGpuMemoryBufferManager::HandleGpuMemoryBufferCreatedOnIO,
             base::Unretained(this), base::Unretained(request)));
     return;
   }
 
-  DCHECK(GpuMemoryBufferImplSharedMemory::IsFormatSupported(request->format))
-      << static_cast<int>(request->format);
   DCHECK(GpuMemoryBufferImplSharedMemory::IsUsageSupported(request->usage))
       << static_cast<int>(request->usage);
 
   BufferMap& buffers = clients_[request->client_id];
 
   // Allocate shared memory buffer as fallback.
   auto insert_result = buffers.insert(std::make_pair(
       new_id, BufferInfo(request->size, gfx::SHARED_MEMORY_BUFFER,
                          request->format, request->usage, 0)));
   DCHECK(insert_result.second);
@@ skipping 215 matching lines @@
     return gpu_client_tracing_id_;
   }
 
   // In normal cases, |client_id| is a child process id, so we can perform
   // the standard conversion.
   return ChildProcessHostImpl::ChildProcessUniqueIdToTracingProcessId(
       client_id);
 }
 
 }  // namespace content