 Chromium Code Reviews
 Chromium Code Reviews Issue 225023009:
  Add Intel DRM backed GpuMemoryBuffer implementation. 
  Base URL: svn://svn.chromium.org/chrome/trunk/src
    
  
    Issue 225023009:
  Add Intel DRM backed GpuMemoryBuffer implementation. 
  Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: content/browser/gpu/browser_gpu_channel_host_factory.cc | 
| diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc | 
| index 55d59dfc4fcc5663d5983ac6773568badd883ea6..3c3294c63ba662969b2ac21244b509b6ab2a0cf4 100644 | 
| --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc | 
| +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc | 
| @@ -18,6 +18,10 @@ | 
| #include "content/public/common/content_client.h" | 
| #include "ipc/ipc_forwarding_message_filter.h" | 
| +#if defined(OS_LINUX) | 
| +#include "content/common/gpu/client/gpu_memory_buffer_impl_intel_drm.h" | 
| +#endif | 
| + | 
| namespace content { | 
| BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL; | 
| @@ -382,6 +386,21 @@ scoped_ptr<gfx::GpuMemoryBuffer> | 
| if (!GpuMemoryBufferImpl::IsFormatValid(internalformat)) | 
| return scoped_ptr<gfx::GpuMemoryBuffer>(); | 
| +#if defined(OS_LINUX) | 
| + if (!GpuMemoryBufferImplIntelDRM::IsFormatSupported(internalformat)) { | 
| 
fjhenigman
2014/04/10 16:26:01
remove the !
 
reveman
2014/04/10 17:48:28
Done.
 | 
| + drm_intel_bo* buffer_object = | 
| + GpuMemoryBufferImplIntelDRM::CreateBufferObject( | 
| + gfx::Size(width, height), internalformat); | 
| + if (buffer_object) { | 
| + scoped_ptr<GpuMemoryBufferImplIntelDRM> buffer( | 
| + new GpuMemoryBufferImplIntelDRM(gfx::Size(width, height), | 
| + internalformat)); | 
| + if (!buffer->InitializeFromBufferObject(buffer_object)) | 
| 
fjhenigman
2014/04/10 16:26:01
remove this ! too
 
reveman
2014/04/10 17:48:28
Done.
 | 
| + return buffer.PassAs<gfx::GpuMemoryBuffer>(); | 
| + } | 
| + } | 
| +#endif | 
| + | 
| size_t size = width * height * | 
| GpuMemoryBufferImpl::BytesPerPixel(internalformat); | 
| scoped_ptr<base::SharedMemory> shm(new base::SharedMemory()); |