diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 23:27:38 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 23:27:38 +0000 |
| commit | da1515146f602b1bc3db363499f161a39dff340d (patch) | |
| tree | f5fd4d11c5be884e8898f9f36e520d5c775bc19b /gpu | |
| parent | 1dc82ffc4d82464d8dee9153f7b6302c0b6243f4 (diff) | |
| download | chromium_src-da1515146f602b1bc3db363499f161a39dff340d.zip chromium_src-da1515146f602b1bc3db363499f161a39dff340d.tar.gz chromium_src-da1515146f602b1bc3db363499f161a39dff340d.tar.bz2 | |
Fix frame_rate_tests for Vista.
chrome on Vista uses accelerated canvas even without accelerated compositing. So to force software, we need --disable-accelerated-2d-canvas.
Additionally, to avoid potential flakiness, moved the check from context creation success to actual swap buffers - that way if someone creates a context without drawing, it will not trigger.
BUG=103956
Review URL: http://codereview.chromium.org/8491056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index fc12352..7219e3d 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -2062,10 +2062,6 @@ bool GLES2DecoderImpl::Initialize( return false; } - // TRACE_EVENT for gpu tests: - TRACE_EVENT_INSTANT1("test_gpu", "GLES2DecoderImpl::Initialize", "GLImpl", - static_cast<int>(gfx::GetGLImplementation())); - return true; } @@ -7088,6 +7084,9 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers( uint32 immediate_data_size, const gles2::SwapBuffers& c) { bool is_offscreen = !!offscreen_target_frame_buffer_.get(); int this_frame_number = frame_number_++; + // TRACE_EVENT for gpu tests: + TRACE_EVENT_INSTANT1("test_gpu", "SwapBuffers", + "GLImpl", static_cast<int>(gfx::GetGLImplementation())); TRACE_EVENT2("gpu", "GLES2DecoderImpl::HandleSwapBuffers", "offscreen", is_offscreen, "frame", this_frame_number); |