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

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

Issue 1418603002: Revert of Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « ui/gl/gl_image_egl.h ('k') | ui/gl/gl_image_glx.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_egl.h" 5 #include "ui/gl/gl_image_egl.h"
6 6
7 #include "ui/gl/egl_util.h" 7 #include "ui/gl/egl_util.h"
8 #include "ui/gl/gl_surface_egl.h" 8 #include "ui/gl/gl_surface_egl.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 GLImageEGL::GLImageEGL(const Size& size) 12 GLImageEGL::GLImageEGL(const gfx::Size& size)
13 : egl_image_(EGL_NO_IMAGE_KHR), size_(size) {} 13 : egl_image_(EGL_NO_IMAGE_KHR), size_(size) {
14 }
14 15
15 GLImageEGL::~GLImageEGL() { 16 GLImageEGL::~GLImageEGL() {
16 DCHECK(thread_checker_.CalledOnValidThread()); 17 DCHECK(thread_checker_.CalledOnValidThread());
17 DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_); 18 DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
18 } 19 }
19 20
20 bool GLImageEGL::Initialize(EGLenum target, 21 bool GLImageEGL::Initialize(EGLenum target,
21 EGLClientBuffer buffer, 22 EGLClientBuffer buffer,
22 const EGLint* attrs) { 23 const EGLint* attrs) {
23 DCHECK(thread_checker_.CalledOnValidThread()); 24 DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 17 matching lines...) Expand all
41 EGLBoolean result = 42 EGLBoolean result =
42 eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(), egl_image_); 43 eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(), egl_image_);
43 if (result == EGL_FALSE) { 44 if (result == EGL_FALSE) {
44 DLOG(ERROR) << "Error destroying EGLImage: " 45 DLOG(ERROR) << "Error destroying EGLImage: "
45 << ui::GetLastEGLErrorString(); 46 << ui::GetLastEGLErrorString();
46 } 47 }
47 egl_image_ = EGL_NO_IMAGE_KHR; 48 egl_image_ = EGL_NO_IMAGE_KHR;
48 } 49 }
49 } 50 }
50 51
51 Size GLImageEGL::GetSize() { 52 gfx::Size GLImageEGL::GetSize() { return size_; }
52 return size_;
53 }
54 53
55 unsigned GLImageEGL::GetInternalFormat() { return GL_RGBA; } 54 unsigned GLImageEGL::GetInternalFormat() { return GL_RGBA; }
56 55
57 bool GLImageEGL::BindTexImage(unsigned target) { 56 bool GLImageEGL::BindTexImage(unsigned target) {
58 DCHECK(thread_checker_.CalledOnValidThread()); 57 DCHECK(thread_checker_.CalledOnValidThread());
59 DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_); 58 DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_);
60 glEGLImageTargetTexture2DOES(target, egl_image_); 59 glEGLImageTargetTexture2DOES(target, egl_image_);
61 DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()); 60 DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
62 return true; 61 return true;
63 } 62 }
64 63
65 bool GLImageEGL::CopyTexImage(unsigned target) {
66 return false;
67 }
68
69 bool GLImageEGL::CopyTexSubImage(unsigned target, 64 bool GLImageEGL::CopyTexSubImage(unsigned target,
70 const Point& offset, 65 const Point& offset,
71 const Rect& rect) { 66 const Rect& rect) {
72 return false; 67 return false;
73 } 68 }
74 69
75 bool GLImageEGL::ScheduleOverlayPlane(AcceleratedWidget widget, 70 bool GLImageEGL::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
76 int z_order, 71 int z_order,
77 OverlayTransform transform, 72 OverlayTransform transform,
78 const Rect& bounds_rect, 73 const Rect& bounds_rect,
79 const RectF& crop_rect) { 74 const RectF& crop_rect) {
80 return false; 75 return false;
81 } 76 }
82 77
83 } // namespace gfx 78 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_image_egl.h ('k') | ui/gl/gl_image_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698