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

Side by Side Diff: cc/texture_copier.cc

Issue 11615020: Clean up cc and webkit/compositor_bindings include path shenanigans (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « cc/test/layer_tree_test_common.cc ('k') | cc/texture_uploader.cc » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/texture_copier.h" 5 #include "cc/texture_copier.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "cc/gl_renderer.h" // For the GLC() macro. 9 #include "cc/gl_renderer.h" // For the GLC() macro.
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
10 #include "third_party/khronos/GLES2/gl2.h" 11 #include "third_party/khronos/GLES2/gl2.h"
11 #include <public/WebGraphicsContext3D.h>
12 12
13 namespace cc { 13 namespace cc {
14 14
15 AcceleratedTextureCopier::AcceleratedTextureCopier(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms) 15 AcceleratedTextureCopier::AcceleratedTextureCopier(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
16 : m_context(context) 16 : m_context(context)
17 , m_usingBindUniforms(usingBindUniforms) 17 , m_usingBindUniforms(usingBindUniforms)
18 { 18 {
19 DCHECK(m_context); 19 DCHECK(m_context);
20 GLC(m_context, m_fbo = m_context->createFramebuffer()); 20 GLC(m_context, m_fbo = m_context->createFramebuffer());
21 GLC(m_context, m_positionBuffer = m_context->createBuffer()); 21 GLC(m_context, m_positionBuffer = m_context->createBuffer());
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 GLC(m_context, m_context->enable(GL_SCISSOR_TEST)); 93 GLC(m_context, m_context->enable(GL_SCISSOR_TEST));
94 } 94 }
95 95
96 void AcceleratedTextureCopier::flush() 96 void AcceleratedTextureCopier::flush()
97 { 97 {
98 GLC(m_context, m_context->flush()); 98 GLC(m_context, m_context->flush());
99 } 99 }
100 100
101 } // namespace cc 101 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test_common.cc ('k') | cc/texture_uploader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698