summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-06 01:37:31 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-06 01:37:31 +0000
commit111975c6ed2caac665ed17f876f86536af6c3d2f (patch)
tree80512760fdaffd6354b8152104686095d3d73148 /gpu
parent07ed535b5f4250e2030cd169fb1e9de050eea07e (diff)
downloadchromium_src-111975c6ed2caac665ed17f876f86536af6c3d2f.zip
chromium_src-111975c6ed2caac665ed17f876f86536af6c3d2f.tar.gz
chromium_src-111975c6ed2caac665ed17f876f86536af6c3d2f.tar.bz2
Enable GPU acceleration for Aura on Windows
Use GpuTransportSurface and AcceleratedSurface for rendering on win aura. Run with: --open-ash --force-compositing-mode --enable-threaded-compositing BUG= Review URL: https://chromiumcodereview.appspot.com/10890046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 8dbb2ff..33381c5 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -8269,6 +8269,8 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers(
// If offscreen then don't actually SwapBuffers to the display. Just copy
// the rendered frame to another frame buffer.
if (is_offscreen) {
+ TRACE_EVENT2("gpu", "Offscreen",
+ "width", offscreen_size_.width(), "height", offscreen_size_.height());
if (offscreen_size_ != offscreen_saved_color_texture_->size()) {
// Workaround for NVIDIA driver bug on OS X; crbug.com/89557,
// crbug.com/94163. TODO(kbr): figure out reproduction so Apple will
@@ -8342,7 +8344,9 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers(
return error::kNoError;
}
} else {
- TRACE_EVENT1("gpu", "GLContext::SwapBuffers", "frame", this_frame_number);
+ TRACE_EVENT2("gpu", "Onscreen",
+ "width", surface_->GetSize().width(),
+ "height", surface_->GetSize().height());
if (!surface_->SwapBuffers()) {
LOG(ERROR) << "Context lost because SwapBuffers failed.";
return error::kLostContext;