diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 19:56:40 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 19:56:40 +0000 |
| commit | d5bf7ca12d258942349d25430c7ff2d1eb4a4e50 (patch) | |
| tree | a527b43c86c971ad2f9d5f1df53dc6fbe8c2bd02 /cc | |
| parent | 4d7608f8e51963add407002e21615c72ab33b652 (diff) | |
| download | chromium_src-d5bf7ca12d258942349d25430c7ff2d1eb4a4e50.zip chromium_src-d5bf7ca12d258942349d25430c7ff2d1eb4a4e50.tar.gz chromium_src-d5bf7ca12d258942349d25430c7ff2d1eb4a4e50.tar.bz2 | |
Refactor so chromium only GL extensions require gl2extchromium.h
This is a step toward making third_party/khronos/gl2.h and gl2ext.h
have as few modifications as possible.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11782020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/DEPS | 1 | ||||
| -rw-r--r-- | cc/gl_renderer.cc | 1 | ||||
| -rw-r--r-- | cc/io_surface_layer_impl.cc | 1 | ||||
| -rw-r--r-- | cc/resource_provider.cc | 1 | ||||
| -rw-r--r-- | cc/resource_provider_unittest.cc | 1 | ||||
| -rw-r--r-- | cc/test/fake_web_graphics_context_3d.cc | 1 | ||||
| -rw-r--r-- | cc/texture_uploader.cc | 1 | ||||
| -rw-r--r-- | cc/video_layer_impl.cc | 1 |
8 files changed, 8 insertions, 0 deletions
@@ -1,4 +1,5 @@ include_rules = [ + "+gpu/GLES2", "+media", "+skia/ext", "+third_party/skia/include", diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc index 54eef96..83827a2 100644 --- a/cc/gl_renderer.cc +++ b/cc/gl_renderer.cc @@ -29,6 +29,7 @@ #include "cc/stream_video_draw_quad.h" #include "cc/texture_draw_quad.h" #include "cc/video_layer_impl.h" +#include "gpu/GLES2/gl2extchromium.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc index 944443b..9ea69e2 100644 --- a/cc/io_surface_layer_impl.cc +++ b/cc/io_surface_layer_impl.cc @@ -10,6 +10,7 @@ #include "cc/layer_tree_impl.h" #include "cc/output_surface.h" #include "cc/quad_sink.h" +#include "gpu/GLES2/gl2extchromium.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc index 2155224..2dce22a 100644 --- a/cc/resource_provider.cc +++ b/cc/resource_provider.cc @@ -15,6 +15,7 @@ #include "cc/platform_color.h" #include "cc/texture_uploader.h" #include "cc/transferable_resource.h" +#include "gpu/GLES2/gl2extchromium.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc index 400cb2f..06787bc 100644 --- a/cc/resource_provider_unittest.cc +++ b/cc/resource_provider_unittest.cc @@ -10,6 +10,7 @@ #include "cc/scoped_ptr_hash_map.h" #include "cc/test/fake_output_surface.h" #include "cc/test/fake_web_graphics_context_3d.h" +#include "gpu/GLES2/gl2extchromium.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" diff --git a/cc/test/fake_web_graphics_context_3d.cc b/cc/test/fake_web_graphics_context_3d.cc index ede316d..afcc0b1 100644 --- a/cc/test/fake_web_graphics_context_3d.cc +++ b/cc/test/fake_web_graphics_context_3d.cc @@ -8,6 +8,7 @@ #include <string> #include "base/logging.h" +#include "gpu/GLES2/gl2extchromium.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/texture_uploader.cc b/cc/texture_uploader.cc index 6928cab..bb4cdfe 100644 --- a/cc/texture_uploader.cc +++ b/cc/texture_uploader.cc @@ -13,6 +13,7 @@ #include "cc/prioritized_resource.h" #include "cc/resource.h" #include "cc/util.h" +#include "gpu/GLES2/gl2extchromium.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index 130e6f2..8a320b8 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -14,6 +14,7 @@ #include "cc/stream_video_draw_quad.h" #include "cc/texture_draw_quad.h" #include "cc/yuv_video_draw_quad.h" +#include "gpu/GLES2/gl2extchromium.h" #include "media/filters/skcanvas_video_renderer.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" |