OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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_io_surface.h" | 5 #include "ui/gl/gl_image_io_surface.h" |
6 | 6 |
7 #include "ui/gl/gl_bindings.h" | 7 #include "ui/gl/gl_bindings.h" |
8 #include "ui/gl/gl_context.h" | 8 #include "ui/gl/gl_context.h" |
9 | 9 |
10 // Note that this must be included after gl_bindings.h to avoid conflicts. | 10 // Note that this must be included after gl_bindings.h to avoid conflicts. |
11 #include <OpenGL/CGLIOSurface.h> | 11 #include <OpenGL/CGLIOSurface.h> |
12 | 12 |
13 namespace gfx { | 13 namespace gfx { |
14 | 14 |
15 GLImageIOSurface::GLImageIOSurface(const gfx::Size& size) : size_(size) { | 15 GLImageIOSurface::GLImageIOSurface(const gfx::Size& size) : size_(size) { |
16 } | 16 } |
17 | 17 |
18 GLImageIOSurface::~GLImageIOSurface() { Destroy(); } | 18 GLImageIOSurface::~GLImageIOSurface() { |
19 DCHECK(!io_surface_); | |
20 } | |
19 | 21 |
20 bool GLImageIOSurface::Initialize(const gfx::GpuMemoryBufferHandle& handle) { | 22 bool GLImageIOSurface::Initialize(const gfx::GpuMemoryBufferHandle& handle) { |
21 io_surface_.reset(IOSurfaceLookup(handle.io_surface_id)); | 23 io_surface_.reset(IOSurfaceLookup(handle.io_surface_id)); |
22 if (!io_surface_) { | 24 if (!io_surface_) { |
23 LOG(ERROR) << "IOSurface lookup failed"; | 25 LOG(ERROR) << "IOSurface lookup failed"; |
24 return false; | 26 return false; |
25 } | 27 } |
26 | 28 |
27 return true; | 29 return true; |
28 } | 30 } |
29 | 31 |
32 void GLImageIOSurface::Destroy(bool have_context) { | |
33 io_surface_.reset() | |
reveman
2014/07/21 15:12:24
missing ";"
sohanjg
2014/07/21 15:39:51
Done.
| |
34 } | |
35 | |
30 gfx::Size GLImageIOSurface::GetSize() { return size_; } | 36 gfx::Size GLImageIOSurface::GetSize() { return size_; } |
31 | 37 |
32 bool GLImageIOSurface::BindTexImage(unsigned target) { | 38 bool GLImageIOSurface::BindTexImage(unsigned target) { |
33 if (target != GL_TEXTURE_RECTANGLE_ARB) { | 39 if (target != GL_TEXTURE_RECTANGLE_ARB) { |
34 // This might be supported in the future. For now, perform strict | 40 // This might be supported in the future. For now, perform strict |
35 // validation so we know what's going on. | 41 // validation so we know what's going on. |
36 LOG(ERROR) << "IOSurface requires TEXTURE_RECTANGLE_ARB target"; | 42 LOG(ERROR) << "IOSurface requires TEXTURE_RECTANGLE_ARB target"; |
37 return false; | 43 return false; |
38 } | 44 } |
39 | 45 |
(...skipping 12 matching lines...) Expand all Loading... | |
52 0); | 58 0); |
53 if (cgl_error != kCGLNoError) { | 59 if (cgl_error != kCGLNoError) { |
54 LOG(ERROR) << "Error in CGLTexImageIOSurface2D"; | 60 LOG(ERROR) << "Error in CGLTexImageIOSurface2D"; |
55 return false; | 61 return false; |
56 } | 62 } |
57 | 63 |
58 return true; | 64 return true; |
59 } | 65 } |
60 | 66 |
61 } // namespace gfx | 67 } // namespace gfx |
OLD | NEW |