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

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

Issue 846283002: [Ozone-Demo] Fix surfaceless renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@re-add-surface-mode
Patch Set: Created 5 years, 11 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') | no next file » | 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 "ui/gl/gl_bindings.h" 8 #include "ui/gl/gl_bindings.h"
8 #include "ui/gl/gl_image.h" 9 #include "ui/gl/gl_image.h"
10 #include "ui/gl/gl_surface.h"
9 11
10 namespace ui { 12 namespace ui {
11 13
12 SurfacelessGlRenderer::BufferWrapper::BufferWrapper() 14 SurfacelessGlRenderer::BufferWrapper::BufferWrapper()
13 : widget_(gfx::kNullAcceleratedWidget), gl_fb_(0), gl_tex_(0) { 15 : widget_(gfx::kNullAcceleratedWidget), gl_fb_(0), gl_tex_(0) {
14 } 16 }
15 17
16 SurfacelessGlRenderer::BufferWrapper::~BufferWrapper() { 18 SurfacelessGlRenderer::BufferWrapper::~BufferWrapper() {
17 if (gl_fb_) 19 if (gl_fb_)
18 glDeleteFramebuffersEXT(1, &gl_fb_); 20 glDeleteFramebuffersEXT(1, &gl_fb_);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 glBindFramebufferEXT(GL_FRAMEBUFFER, gl_fb_); 72 glBindFramebufferEXT(GL_FRAMEBUFFER, gl_fb_);
71 } 73 }
72 74
73 void SurfacelessGlRenderer::BufferWrapper::SchedulePlane() { 75 void SurfacelessGlRenderer::BufferWrapper::SchedulePlane() {
74 image_->ScheduleOverlayPlane(widget_, 0, gfx::OVERLAY_TRANSFORM_NONE, 76 image_->ScheduleOverlayPlane(widget_, 0, gfx::OVERLAY_TRANSFORM_NONE,
75 gfx::Rect(size_), gfx::RectF(0, 0, 1, 1)); 77 gfx::Rect(size_), gfx::RectF(0, 0, 1, 1));
76 } 78 }
77 79
78 SurfacelessGlRenderer::SurfacelessGlRenderer(gfx::AcceleratedWidget widget, 80 SurfacelessGlRenderer::SurfacelessGlRenderer(gfx::AcceleratedWidget widget,
79 const gfx::Size& size) 81 const gfx::Size& size)
80 : GlRenderer(widget, size), back_buffer_(0) { 82 : GlRenderer(widget, size),
83 back_buffer_(0),
84 is_swapping_buffers_(false),
85 weak_ptr_factory_(this) {
81 } 86 }
82 87
83 SurfacelessGlRenderer::~SurfacelessGlRenderer() { 88 SurfacelessGlRenderer::~SurfacelessGlRenderer() {
84 } 89 }
85 90
86 bool SurfacelessGlRenderer::Initialize() { 91 bool SurfacelessGlRenderer::Initialize() {
87 if (!GlRenderer::Initialize()) 92 if (!GlRenderer::Initialize())
88 return false; 93 return false;
89 94
90 for (size_t i = 0; i < arraysize(buffers_); ++i) 95 for (size_t i = 0; i < arraysize(buffers_); ++i)
91 if (!buffers_[i].Initialize(&buffer_factory_, widget_, size_)) 96 if (!buffers_[i].Initialize(&buffer_factory_, widget_, size_))
92 return false; 97 return false;
93 98
94 return true; 99 return true;
95 } 100 }
96 101
97 void SurfacelessGlRenderer::RenderFrame() { 102 void SurfacelessGlRenderer::RenderFrame() {
103 if (is_swapping_buffers_)
104 return;
105
106 float fraction = NextFraction();
107
98 buffers_[back_buffer_].BindFramebuffer(); 108 buffers_[back_buffer_].BindFramebuffer();
109
110 glViewport(0, 0, size_.width(), size_.height());
111 glClearColor(1 - fraction, fraction, 0.0, 1.0);
112 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
113
99 buffers_[back_buffer_].SchedulePlane(); 114 buffers_[back_buffer_].SchedulePlane();
115 is_swapping_buffers_ = true;
116 if (!surface_->SwapBuffersAsync(
117 base::Bind(&SurfacelessGlRenderer::OnSwapBuffersAck,
118 weak_ptr_factory_.GetWeakPtr())))
119 LOG(FATAL) << "Failed to swap buffers";
120 }
121
122 void SurfacelessGlRenderer::OnSwapBuffersAck() {
123 is_swapping_buffers_ = false;
100 back_buffer_ ^= 1; 124 back_buffer_ ^= 1;
101
102 GlRenderer::RenderFrame();
103 } 125 }
104 126
105 } // namespace ui 127 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/demo/surfaceless_gl_renderer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698