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

Side by Side Diff: ui/ozone/demo/surfaceless_gl_renderer.cc

Issue 1240353002: ozone: rename to GpuMemoryBuffer(Factory|Impl)OzoneNativePixmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address nits in comments Created 5 years, 5 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/ozone/demo/surfaceless_gl_renderer.h ('k') | ui/ozone/gpu/BUILD.gn » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ozone/demo/surfaceless_gl_renderer.h" 5 #include "ui/ozone/demo/surfaceless_gl_renderer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/gl/gl_bindings.h" 8 #include "ui/gl/gl_bindings.h"
9 #include "ui/gl/gl_context.h" 9 #include "ui/gl/gl_context.h"
10 #include "ui/gl/gl_image.h" 10 #include "ui/gl/gl_image.h"
11 #include "ui/gl/gl_surface.h" 11 #include "ui/gl/gl_surface.h"
12 #include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h" 12 #include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"
13 13
14 namespace ui { 14 namespace ui {
15 15
16 SurfacelessGlRenderer::BufferWrapper::BufferWrapper() { 16 SurfacelessGlRenderer::BufferWrapper::BufferWrapper() {
17 } 17 }
18 18
19 SurfacelessGlRenderer::BufferWrapper::~BufferWrapper() { 19 SurfacelessGlRenderer::BufferWrapper::~BufferWrapper() {
20 if (gl_fb_) 20 if (gl_fb_)
21 glDeleteFramebuffersEXT(1, &gl_fb_); 21 glDeleteFramebuffersEXT(1, &gl_fb_);
22 22
23 if (gl_tex_) { 23 if (gl_tex_) {
24 image_->ReleaseTexImage(GL_TEXTURE_2D); 24 image_->ReleaseTexImage(GL_TEXTURE_2D);
25 glDeleteTextures(1, &gl_tex_); 25 glDeleteTextures(1, &gl_tex_);
26 image_->Destroy(true); 26 image_->Destroy(true);
27 } 27 }
28 } 28 }
29 29
30 bool SurfacelessGlRenderer::BufferWrapper::Initialize( 30 bool SurfacelessGlRenderer::BufferWrapper::Initialize(
31 GpuMemoryBufferFactoryOzoneNativeBuffer* buffer_factory, 31 GpuMemoryBufferFactoryOzoneNativePixmap* buffer_factory,
32 gfx::AcceleratedWidget widget, 32 gfx::AcceleratedWidget widget,
33 const gfx::Size& size) { 33 const gfx::Size& size) {
34 glGenFramebuffersEXT(1, &gl_fb_); 34 glGenFramebuffersEXT(1, &gl_fb_);
35 glGenTextures(1, &gl_tex_); 35 glGenTextures(1, &gl_tex_);
36 36
37 static int buffer_id_generator = 1; 37 static int buffer_id_generator = 1;
38 int id = buffer_id_generator++; 38 int id = buffer_id_generator++;
39 39
40 buffer_factory->CreateGpuMemoryBuffer( 40 buffer_factory->CreateGpuMemoryBuffer(
41 id, size, gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT, 41 id, size, gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 } 74 }
75 75
76 void SurfacelessGlRenderer::BufferWrapper::SchedulePlane() { 76 void SurfacelessGlRenderer::BufferWrapper::SchedulePlane() {
77 image_->ScheduleOverlayPlane(widget_, 0, gfx::OVERLAY_TRANSFORM_NONE, 77 image_->ScheduleOverlayPlane(widget_, 0, gfx::OVERLAY_TRANSFORM_NONE,
78 gfx::Rect(size_), gfx::RectF(0, 0, 1, 1)); 78 gfx::Rect(size_), gfx::RectF(0, 0, 1, 1));
79 } 79 }
80 80
81 SurfacelessGlRenderer::SurfacelessGlRenderer( 81 SurfacelessGlRenderer::SurfacelessGlRenderer(
82 gfx::AcceleratedWidget widget, 82 gfx::AcceleratedWidget widget,
83 const gfx::Size& size, 83 const gfx::Size& size,
84 GpuMemoryBufferFactoryOzoneNativeBuffer* buffer_factory) 84 GpuMemoryBufferFactoryOzoneNativePixmap* buffer_factory)
85 : GlRenderer(widget, size), 85 : GlRenderer(widget, size),
86 buffer_factory_(buffer_factory), 86 buffer_factory_(buffer_factory),
87 weak_ptr_factory_(this) { 87 weak_ptr_factory_(this) {}
88 }
89 88
90 SurfacelessGlRenderer::~SurfacelessGlRenderer() { 89 SurfacelessGlRenderer::~SurfacelessGlRenderer() {
91 // Need to make current when deleting the framebuffer resources allocated in 90 // Need to make current when deleting the framebuffer resources allocated in
92 // the buffers. 91 // the buffers.
93 context_->MakeCurrent(surface_.get()); 92 context_->MakeCurrent(surface_.get());
94 } 93 }
95 94
96 bool SurfacelessGlRenderer::Initialize() { 95 bool SurfacelessGlRenderer::Initialize() {
97 if (!GlRenderer::Initialize()) 96 if (!GlRenderer::Initialize())
98 return false; 97 return false;
(...skipping 21 matching lines...) Expand all
120 if (!surface_->SwapBuffersAsync(base::Bind(&GlRenderer::PostRenderFrameTask, 119 if (!surface_->SwapBuffersAsync(base::Bind(&GlRenderer::PostRenderFrameTask,
121 weak_ptr_factory_.GetWeakPtr()))) 120 weak_ptr_factory_.GetWeakPtr())))
122 LOG(FATAL) << "Failed to swap buffers"; 121 LOG(FATAL) << "Failed to swap buffers";
123 } 122 }
124 123
125 scoped_refptr<gfx::GLSurface> SurfacelessGlRenderer::CreateSurface() { 124 scoped_refptr<gfx::GLSurface> SurfacelessGlRenderer::CreateSurface() {
126 return gfx::GLSurface::CreateSurfacelessViewGLSurface(widget_); 125 return gfx::GLSurface::CreateSurfacelessViewGLSurface(widget_);
127 } 126 }
128 127
129 } // namespace ui 128 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/demo/surfaceless_gl_renderer.h ('k') | ui/ozone/gpu/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698