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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 419073008: Simplified GPU Tracer by removing parent base class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed paren mismatch Created 6 years, 4 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
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 "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 2325 matching lines...) Expand 10 before | Expand all | Expand 10 after
2336 const scoped_refptr<gfx::GLContext>& context, 2336 const scoped_refptr<gfx::GLContext>& context,
2337 bool offscreen, 2337 bool offscreen,
2338 const gfx::Size& size, 2338 const gfx::Size& size,
2339 const DisallowedFeatures& disallowed_features, 2339 const DisallowedFeatures& disallowed_features,
2340 const std::vector<int32>& attribs) { 2340 const std::vector<int32>& attribs) {
2341 TRACE_EVENT0("gpu", "GLES2DecoderImpl::Initialize"); 2341 TRACE_EVENT0("gpu", "GLES2DecoderImpl::Initialize");
2342 DCHECK(context->IsCurrent(surface.get())); 2342 DCHECK(context->IsCurrent(surface.get()));
2343 DCHECK(!context_.get()); 2343 DCHECK(!context_.get());
2344 2344
2345 set_initialized(); 2345 set_initialized();
2346 gpu_tracer_ = GPUTracer::Create(this); 2346 gpu_tracer_.reset(new GPUTracer(this));
2347 gpu_state_tracer_ = GPUStateTracer::Create(&state_); 2347 gpu_state_tracer_ = GPUStateTracer::Create(&state_);
2348 // TODO(vmiura): Enable changing gpu_trace_level_ at runtime 2348 // TODO(vmiura): Enable changing gpu_trace_level_ at runtime
2349 gpu_trace_level_ = 2; 2349 gpu_trace_level_ = 2;
2350 gpu_trace_commands_ = false; 2350 gpu_trace_commands_ = false;
2351 2351
2352 if (CommandLine::ForCurrentProcess()->HasSwitch( 2352 if (CommandLine::ForCurrentProcess()->HasSwitch(
2353 switches::kEnableGPUDebugging)) { 2353 switches::kEnableGPUDebugging)) {
2354 set_debug(true); 2354 set_debug(true);
2355 } 2355 }
2356 2356
(...skipping 8572 matching lines...) Expand 10 before | Expand all | Expand 10 after
10929 } 10929 }
10930 } 10930 }
10931 10931
10932 // Include the auto-generated part of this file. We split this because it means 10932 // Include the auto-generated part of this file. We split this because it means
10933 // we can easily edit the non-auto generated parts right here in this file 10933 // we can easily edit the non-auto generated parts right here in this file
10934 // instead of having to edit some template or the code generator. 10934 // instead of having to edit some template or the code generator.
10935 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 10935 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
10936 10936
10937 } // namespace gles2 10937 } // namespace gles2
10938 } // namespace gpu 10938 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/gpu_tracer.h » ('j') | gpu/command_buffer/service/gpu_tracer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698