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

Side by Side Diff: ppapi/shared_impl/ppb_graphics_3d_shared.cc

Issue 1132283003: Merge Group Markers into Chromium Traces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make SwapBuffers use the GLES2Decoder GL_Category Created 5 years, 5 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 | « gpu/command_buffer/service/gpu_tracer_unittest.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ppapi/shared_impl/ppb_graphics_3d_shared.h" 5 #include "ppapi/shared_impl/ppb_graphics_3d_shared.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "gpu/command_buffer/client/gles2_cmd_helper.h" 8 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
9 #include "gpu/command_buffer/client/gles2_implementation.h" 9 #include "gpu/command_buffer/client/gles2_implementation.h"
10 #include "gpu/command_buffer/client/transfer_buffer.h" 10 #include "gpu/command_buffer/client/transfer_buffer.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 GetGpuControl())); 132 GetGpuControl()));
133 133
134 if (!gles2_impl_->Initialize( 134 if (!gles2_impl_->Initialize(
135 transfer_buffer_size, 135 transfer_buffer_size,
136 kMinTransferBufferSize, 136 kMinTransferBufferSize,
137 std::max(kMaxTransferBufferSize, transfer_buffer_size), 137 std::max(kMaxTransferBufferSize, transfer_buffer_size),
138 gpu::gles2::GLES2Implementation::kNoLimit)) { 138 gpu::gles2::GLES2Implementation::kNoLimit)) {
139 return false; 139 return false;
140 } 140 }
141 141
142 gles2_impl_->PushGroupMarkerEXT(0, "PPAPIContext"); 142 gles2_impl_->TraceBeginCHROMIUM("gpu_toplevel", "PPAPIContext");
143 143
144 return true; 144 return true;
145 } 145 }
146 146
147 void PPB_Graphics3D_Shared::DestroyGLES2Impl() { 147 void PPB_Graphics3D_Shared::DestroyGLES2Impl() {
148 gles2_impl_.reset(); 148 gles2_impl_.reset();
149 transfer_buffer_.reset(); 149 transfer_buffer_.reset();
150 gles2_helper_.reset(); 150 gles2_helper_.reset();
151 } 151 }
152 152
153 } // namespace ppapi 153 } // namespace ppapi
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gpu_tracer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698