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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 940633004: Added disjoint context class which manages disjoints within gpu timing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplified DisjointContext to simply be an ID instead of an object Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/service/gpu_timing.h » ('j') | gpu/command_buffer/service/gpu_timing.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 6b254e0966bb8ad2de4ee746bf53e6f7cb3dc269..a2c9b38ebdcc1610abc57e4871a7cdd377650f27 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -46,6 +46,7 @@
#include "gpu/command_buffer/service/gles2_cmd_validation.h"
#include "gpu/command_buffer/service/gpu_state_tracer.h"
#include "gpu/command_buffer/service/gpu_switches.h"
+#include "gpu/command_buffer/service/gpu_timing.h"
#include "gpu/command_buffer/service/gpu_tracer.h"
#include "gpu/command_buffer/service/image_manager.h"
#include "gpu/command_buffer/service/mailbox_manager.h"
@@ -1882,6 +1883,7 @@ class GLES2DecoderImpl : public GLES2Decoder,
DecoderTextureState texture_state_;
DecoderFramebufferState framebuffer_state_;
+ GPUTiming gpu_timing_;
scoped_ptr<GPUTracer> gpu_tracer_;
scoped_ptr<GPUStateTracer> gpu_state_tracer_;
const unsigned char* cb_command_trace_category_;
@@ -2445,7 +2447,8 @@ bool GLES2DecoderImpl::Initialize(
surfaceless_ = surface->IsSurfaceless() && !offscreen;
set_initialized();
- gpu_tracer_.reset(new GPUTracer(this));
+ gpu_timing_.Initialize(context.get());
+ gpu_tracer_.reset(new GPUTracer(this, &gpu_timing_));
gpu_state_tracer_ = GPUStateTracer::Create(&state_);
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
« no previous file with comments | « no previous file | gpu/command_buffer/service/gpu_timing.h » ('j') | gpu/command_buffer/service/gpu_timing.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698