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

Side by Side Diff: cc/output/program_binding.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « cc/output/output_surface.cc ('k') | cc/output/shader.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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/output/program_binding.h" 5 #include "cc/output/program_binding.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/trace_event/trace_event.h"
8 #include "cc/output/geometry_binding.h" 8 #include "cc/output/geometry_binding.h"
9 #include "gpu/command_buffer/client/gles2_interface.h" 9 #include "gpu/command_buffer/client/gles2_interface.h"
10 10
11 using gpu::gles2::GLES2Interface; 11 using gpu::gles2::GLES2Interface;
12 12
13 namespace cc { 13 namespace cc {
14 14
15 ProgramBindingBase::ProgramBindingBase() 15 ProgramBindingBase::ProgramBindingBase()
16 : program_(0), 16 : program_(0),
17 vertex_shader_id_(0), 17 vertex_shader_id_(0),
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 context->DeleteShader(vertex_shader_id_); 123 context->DeleteShader(vertex_shader_id_);
124 vertex_shader_id_ = 0; 124 vertex_shader_id_ = 0;
125 } 125 }
126 if (fragment_shader_id_) { 126 if (fragment_shader_id_) {
127 context->DeleteShader(fragment_shader_id_); 127 context->DeleteShader(fragment_shader_id_);
128 fragment_shader_id_ = 0; 128 fragment_shader_id_ = 0;
129 } 129 }
130 } 130 }
131 131
132 } // namespace cc 132 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/output_surface.cc ('k') | cc/output/shader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698