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

Side by Side Diff: cc/gl_renderer.cc

Issue 11782020: Refactor so chromium only GL extensions require gl2extchromium.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « cc/DEPS ('k') | cc/io_surface_layer_impl.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 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 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/gl_renderer.h" 5 #include "cc/gl_renderer.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "cc/math_util.h" 22 #include "cc/math_util.h"
23 #include "cc/priority_calculator.h" 23 #include "cc/priority_calculator.h"
24 #include "cc/proxy.h" 24 #include "cc/proxy.h"
25 #include "cc/render_pass.h" 25 #include "cc/render_pass.h"
26 #include "cc/render_surface_filters.h" 26 #include "cc/render_surface_filters.h"
27 #include "cc/scoped_resource.h" 27 #include "cc/scoped_resource.h"
28 #include "cc/single_thread_proxy.h" 28 #include "cc/single_thread_proxy.h"
29 #include "cc/stream_video_draw_quad.h" 29 #include "cc/stream_video_draw_quad.h"
30 #include "cc/texture_draw_quad.h" 30 #include "cc/texture_draw_quad.h"
31 #include "cc/video_layer_impl.h" 31 #include "cc/video_layer_impl.h"
32 #include "gpu/GLES2/gl2extchromium.h"
32 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h" 33 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
33 #include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsCo ntext3D.h" 34 #include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsCo ntext3D.h"
34 #include "third_party/khronos/GLES2/gl2.h" 35 #include "third_party/khronos/GLES2/gl2.h"
35 #include "third_party/khronos/GLES2/gl2ext.h" 36 #include "third_party/khronos/GLES2/gl2ext.h"
36 #include "third_party/skia/include/core/SkBitmap.h" 37 #include "third_party/skia/include/core/SkBitmap.h"
37 #include "third_party/skia/include/core/SkColor.h" 38 #include "third_party/skia/include/core/SkColor.h"
38 #include "third_party/skia/include/gpu/GrContext.h" 39 #include "third_party/skia/include/gpu/GrContext.h"
39 #include "third_party/skia/include/gpu/GrTexture.h" 40 #include "third_party/skia/include/gpu/GrTexture.h"
40 #include "third_party/skia/include/gpu/SkGpuDevice.h" 41 #include "third_party/skia/include/gpu/SkGpuDevice.h"
41 #include "third_party/skia/include/gpu/SkGrTexturePixelRef.h" 42 #include "third_party/skia/include/gpu/SkGrTexturePixelRef.h"
(...skipping 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1794 1795
1795 releaseRenderPassTextures(); 1796 releaseRenderPassTextures();
1796 } 1797 }
1797 1798
1798 bool GLRenderer::isContextLost() 1799 bool GLRenderer::isContextLost()
1799 { 1800 {
1800 return (m_context->getGraphicsResetStatusARB() != GL_NO_ERROR); 1801 return (m_context->getGraphicsResetStatusARB() != GL_NO_ERROR);
1801 } 1802 }
1802 1803
1803 } // namespace cc 1804 } // namespace cc
OLDNEW
« no previous file with comments | « cc/DEPS ('k') | cc/io_surface_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698