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

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

Issue 1420503011: GLES2CmdDecoder should resize GLSurface using GLSurface::Resize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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_surface_x11.cc ('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/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 "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "ui/gl/gl_bindings.h" 10 #include "ui/gl/gl_bindings.h"
(...skipping 11 matching lines...) Expand all
22 } 22 }
23 23
24 bool GlRenderer::Initialize() { 24 bool GlRenderer::Initialize() {
25 context_ = gfx::GLContext::CreateGLContext(NULL, surface_.get(), 25 context_ = gfx::GLContext::CreateGLContext(NULL, surface_.get(),
26 gfx::PreferIntegratedGpu); 26 gfx::PreferIntegratedGpu);
27 if (!context_.get()) { 27 if (!context_.get()) {
28 LOG(ERROR) << "Failed to create GL context"; 28 LOG(ERROR) << "Failed to create GL context";
29 return false; 29 return false;
30 } 30 }
31 31
32 surface_->Resize(size_); 32 surface_->Resize(size_, 1.f);
33 33
34 if (!context_->MakeCurrent(surface_.get())) { 34 if (!context_->MakeCurrent(surface_.get())) {
35 LOG(ERROR) << "Failed to make GL context current"; 35 LOG(ERROR) << "Failed to make GL context current";
36 return false; 36 return false;
37 } 37 }
38 38
39 PostRenderFrameTask(gfx::SwapResult::SWAP_ACK); 39 PostRenderFrameTask(gfx::SwapResult::SWAP_ACK);
40 return true; 40 return true;
41 } 41 }
42 42
(...skipping 13 matching lines...) Expand all
56 LOG(FATAL) << "Failed to swap buffers"; 56 LOG(FATAL) << "Failed to swap buffers";
57 } 57 }
58 58
59 void GlRenderer::PostRenderFrameTask(gfx::SwapResult result) { 59 void GlRenderer::PostRenderFrameTask(gfx::SwapResult result) {
60 base::ThreadTaskRunnerHandle::Get()->PostTask( 60 base::ThreadTaskRunnerHandle::Get()->PostTask(
61 FROM_HERE, 61 FROM_HERE,
62 base::Bind(&GlRenderer::RenderFrame, weak_ptr_factory_.GetWeakPtr())); 62 base::Bind(&GlRenderer::RenderFrame, weak_ptr_factory_.GetWeakPtr()));
63 } 63 }
64 64
65 } // namespace ui 65 } // namespace ui
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698