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

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

Issue 1018773002: Added Destroy() functions for GPUTimer and GPUTracer/GPUTrace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delete GPU Tracer after destroying it in decoder Created 5 years, 8 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 | « no previous file | gpu/command_buffer/service/gpu_tracer.h » ('j') | 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 "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 3737 matching lines...) Expand 10 before | Expand all | Expand 10 after
3748 3748
3749 // Need to release these before releasing |group_| which may own the 3749 // Need to release these before releasing |group_| which may own the
3750 // ShaderTranslatorCache. 3750 // ShaderTranslatorCache.
3751 fragment_translator_ = NULL; 3751 fragment_translator_ = NULL;
3752 vertex_translator_ = NULL; 3752 vertex_translator_ = NULL;
3753 3753
3754 // Should destroy the transfer manager before the texture manager held 3754 // Should destroy the transfer manager before the texture manager held
3755 // by the context group. 3755 // by the context group.
3756 async_pixel_transfer_manager_.reset(); 3756 async_pixel_transfer_manager_.reset();
3757 3757
3758 // Destroy the GPU Tracer which may own some in process GPU Timings.
3759 gpu_tracer_->Destroy(have_context);
3760 gpu_tracer_ = NULL;
3761
3758 if (group_.get()) { 3762 if (group_.get()) {
3759 framebuffer_manager()->RemoveObserver(this); 3763 framebuffer_manager()->RemoveObserver(this);
3760 group_->Destroy(this, have_context); 3764 group_->Destroy(this, have_context);
3761 group_ = NULL; 3765 group_ = NULL;
3762 } 3766 }
3763 3767
3764 if (context_.get()) { 3768 if (context_.get()) {
3765 context_->ReleaseCurrent(NULL); 3769 context_->ReleaseCurrent(NULL);
3766 context_ = NULL; 3770 context_ = NULL;
3767 } 3771 }
(...skipping 8663 matching lines...) Expand 10 before | Expand all | Expand 10 after
12431 } 12435 }
12432 } 12436 }
12433 12437
12434 // Include the auto-generated part of this file. We split this because it means 12438 // Include the auto-generated part of this file. We split this because it means
12435 // we can easily edit the non-auto generated parts right here in this file 12439 // we can easily edit the non-auto generated parts right here in this file
12436 // instead of having to edit some template or the code generator. 12440 // instead of having to edit some template or the code generator.
12437 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 12441 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
12438 12442
12439 } // namespace gles2 12443 } // namespace gles2
12440 } // namespace gpu 12444 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/gpu_tracer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698