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

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

Issue 1084173004: Adding status to swap complete (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix ozone demo Created 5 years, 6 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/gl_renderer.h ('k') | ui/ozone/demo/surfaceless_gl_renderer.cc » ('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/gl_renderer.h" 5 #include "ui/ozone/demo/gl_renderer.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
9 #include "ui/gl/gl_bindings.h" 9 #include "ui/gl/gl_bindings.h"
10 #include "ui/gl/gl_context.h" 10 #include "ui/gl/gl_context.h"
(...skipping 22 matching lines...) Expand all
33 return false; 33 return false;
34 } 34 }
35 35
36 surface_->Resize(size_); 36 surface_->Resize(size_);
37 37
38 if (!context_->MakeCurrent(surface_.get())) { 38 if (!context_->MakeCurrent(surface_.get())) {
39 LOG(ERROR) << "Failed to make GL context current"; 39 LOG(ERROR) << "Failed to make GL context current";
40 return false; 40 return false;
41 } 41 }
42 42
43 PostRenderFrameTask(); 43 PostRenderFrameTask(gfx::SwapResult::SWAP_ACK);
44 return true; 44 return true;
45 } 45 }
46 46
47 void GlRenderer::RenderFrame() { 47 void GlRenderer::RenderFrame() {
48 float fraction = NextFraction(); 48 float fraction = NextFraction();
49 49
50 context_->MakeCurrent(surface_.get()); 50 context_->MakeCurrent(surface_.get());
51 51
52 glViewport(0, 0, size_.width(), size_.height()); 52 glViewport(0, 0, size_.width(), size_.height());
53 glClearColor(1 - fraction, fraction, 0.0, 1.0); 53 glClearColor(1 - fraction, fraction, 0.0, 1.0);
54 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); 54 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
55 55
56 if (!surface_->SwapBuffersAsync(base::Bind(&GlRenderer::PostRenderFrameTask, 56 if (!surface_->SwapBuffersAsync(base::Bind(&GlRenderer::PostRenderFrameTask,
57 weak_ptr_factory_.GetWeakPtr()))) 57 weak_ptr_factory_.GetWeakPtr())))
58 LOG(FATAL) << "Failed to swap buffers"; 58 LOG(FATAL) << "Failed to swap buffers";
59 } 59 }
60 60
61 void GlRenderer::PostRenderFrameTask() { 61 void GlRenderer::PostRenderFrameTask(gfx::SwapResult result) {
62 base::ThreadTaskRunnerHandle::Get()->PostTask( 62 base::ThreadTaskRunnerHandle::Get()->PostTask(
63 FROM_HERE, 63 FROM_HERE,
64 base::Bind(&GlRenderer::RenderFrame, weak_ptr_factory_.GetWeakPtr())); 64 base::Bind(&GlRenderer::RenderFrame, weak_ptr_factory_.GetWeakPtr()));
65 } 65 }
66 66
67 scoped_refptr<gfx::GLSurface> GlRenderer::CreateSurface() { 67 scoped_refptr<gfx::GLSurface> GlRenderer::CreateSurface() {
68 return gfx::GLSurface::CreateViewGLSurface(widget_); 68 return gfx::GLSurface::CreateViewGLSurface(widget_);
69 } 69 }
70 70
71 } // namespace ui 71 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/demo/gl_renderer.h ('k') | ui/ozone/demo/surfaceless_gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698