Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(620)

Side by Side Diff: ui/gl/gl_image_linux.cc

Issue 13543007: GLImage support for Android zero-copy pixel buffers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix the decoder used for GLSuppressor Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gl/gl_image.h" 5 #include "ui/gl/gl_image.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "ui/gl/gl_image_glx.h" 8 #include "ui/gl/gl_image_glx.h"
9 #include "ui/gl/gl_image_stub.h" 9 #include "ui/gl/gl_image_stub.h"
10 #include "ui/gl/gl_implementation.h" 10 #include "ui/gl/gl_implementation.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) { 14 scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
15 TRACE_EVENT0("gpu", "GLImage::CreateGLImage"); 15 TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
16 switch (GetGLImplementation()) { 16 switch (GetGLImplementation()) {
17 case kGLImplementationOSMesaGL: { 17 case kGLImplementationOSMesaGL: {
reveman 2013/04/05 17:58:07 if you remove redundant braces below, please remov
kaanb 2013/04/05 18:49:25 Done.
18 return NULL; 18 return NULL;
19 } 19 }
20 case kGLImplementationDesktopGL: { 20 case kGLImplementationDesktopGL: {
21 scoped_refptr<GLImageGLX> image(new GLImageGLX(window)); 21 scoped_refptr<GLImageGLX> image(new GLImageGLX(window));
22 if (!image->Initialize()) 22 if (!image->Initialize())
23 return NULL; 23 return NULL;
24 24
25 return image; 25 return image;
26 } 26 }
27 case kGLImplementationEGLGLES2: { 27 case kGLImplementationEGLGLES2: {
reveman 2013/04/05 17:58:07 and here
kaanb 2013/04/05 18:49:25 Done.
28 return NULL; 28 return NULL;
29 } 29 }
30 case kGLImplementationMockGL: 30 case kGLImplementationMockGL:
31 return new GLImageStub; 31 return new GLImageStub;
32 default: 32 default:
33 NOTREACHED(); 33 NOTREACHED();
34 return NULL; 34 return NULL;
35 } 35 }
36 } 36 }
37 37
38 scoped_refptr<GLImage> GLImage::CreateGLImageForPixelBuffer(
39 gfx::PixelBufferHandle buffer, const gfx::Size& size) {
40 TRACE_EVENT0("gpu", "GLImage::CreateGLImageForPixelBuffer");
41 switch (GetGLImplementation()) {
42 case kGLImplementationOSMesaGL:
43 case kGLImplementationDesktopGL:
44 case kGLImplementationEGLGLES2: {
apatrick_chromium 2013/04/05 17:35:58 nit: braces are redundant
kaanb 2013/04/05 18:49:25 Done.
45 return NULL;
46 }
47 case kGLImplementationMockGL:
48 return new GLImageStub;
49 default:
50 NOTREACHED();
51 return NULL;
52 }
53 }
54
38 } // namespace gfx 55 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698