diff options
28 files changed, 28 insertions, 5 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" diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc index 62b4719..098e99e 100644 --- a/content/browser/renderer_host/image_transport_factory.cc +++ b/content/browser/renderer_host/image_transport_factory.cc @@ -26,6 +26,7 @@ #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/common/webkitplatformsupport_impl.h" #include "content/public/common/content_switches.h" +#include "gpu/GLES2/gl2extchromium.h" #include "gpu/ipc/command_buffer_proxy.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 27975a3..e945c12 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -68,6 +68,7 @@ #if defined(OS_MACOSX) #include "content/common/mac/font_descriptor.h" #else +#include "gpu/GLES2/gl2extchromium.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" #endif diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc index 30982bb..2ffd9d1 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc @@ -33,6 +33,7 @@ #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/client/transfer_buffer.h" #include "gpu/command_buffer/common/constants.h" +#include "gpu/GLES2/gl2extchromium.h" #include "gpu/ipc/command_buffer_proxy.h" #include "webkit/gpu/gl_bindings_skia_cmd_buffer.h" diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index 8e5d9fa..7ea2e28 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -7,7 +7,8 @@ #ifndef GPU_GLES2_GL2EXTCHROMIUM_H_ #define GPU_GLES2_GL2EXTCHROMIUM_H_ -#include <GLES2/gl2chromium.h> +#include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> #ifdef __cplusplus extern "C" { diff --git a/gpu/command_buffer/client/gles2_c_lib.cc b/gpu/command_buffer/client/gles2_c_lib.cc index 0bed5f8..ed3e009 100644 --- a/gpu/command_buffer/client/gles2_c_lib.cc +++ b/gpu/command_buffer/client/gles2_c_lib.cc @@ -11,6 +11,7 @@ #define GL_GLEXT_PROTOTYPES #endif #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> extern "C" { // Include the auto-generated part of this file. We split this because it means diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 4ddb51d..eb1dfcd 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -14,6 +14,7 @@ #include <stdio.h> #include <string.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "../client/buffer_tracker.h" #include "../client/mapped_memory.h" #include "../client/program_info_manager.h" diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc index 6176525..7589074 100644 --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc @@ -7,6 +7,7 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "gpu/command_buffer/client/client_test_helper.h" #include "gpu/command_buffer/client/program_info_manager.h" #include "gpu/command_buffer/client/transfer_buffer.h" diff --git a/gpu/command_buffer/client/query_tracker.cc b/gpu/command_buffer/client/query_tracker.cc index 1983262..ccb6962 100644 --- a/gpu/command_buffer/client/query_tracker.cc +++ b/gpu/command_buffer/client/query_tracker.cc @@ -4,6 +4,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "../client/query_tracker.h" diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc index b6b268c..f2513a9 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils.cc +++ b/gpu/command_buffer/common/gles2_cmd_utils.cc @@ -8,6 +8,7 @@ #include <stdio.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "../common/gles2_cmd_utils.h" #include "../common/gles2_cmd_format.h" diff --git a/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc b/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc index 0eb908c..864c881 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc +++ b/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc @@ -7,6 +7,7 @@ #include <limits> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "testing/gtest/include/gtest/gtest.h" diff --git a/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc b/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc index 0c564b1..c313273 100644 --- a/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc +++ b/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc @@ -4,6 +4,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "gpu/command_buffer/tests/gl_manager.h" #include "gpu/command_buffer/tests/gl_test_utils.h" diff --git a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc index 4ec3760..c1d3c98 100644 --- a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc +++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc @@ -4,6 +4,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "gpu/command_buffer/tests/gl_manager.h" #include "gpu/command_buffer/tests/gl_test_utils.h" diff --git a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc index 17f9ebf..48183a1 100644 --- a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc +++ b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc @@ -8,6 +8,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "gpu/command_buffer/tests/gl_manager.h" #include "gpu/command_buffer/tests/gl_test_utils.h" diff --git a/gpu/command_buffer/tests/gl_lose_context_chromium_unittests.cc b/gpu/command_buffer/tests/gl_lose_context_chromium_unittests.cc index 385cc88..00ebc85 100644 --- a/gpu/command_buffer/tests/gl_lose_context_chromium_unittests.cc +++ b/gpu/command_buffer/tests/gl_lose_context_chromium_unittests.cc @@ -4,6 +4,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "base/logging.h" #include "gpu/command_buffer/tests/gl_manager.h" diff --git a/gpu/command_buffer/tests/gl_query_unittests.cc b/gpu/command_buffer/tests/gl_query_unittests.cc index 90d3568..4d1700d 100644 --- a/gpu/command_buffer/tests/gl_query_unittests.cc +++ b/gpu/command_buffer/tests/gl_query_unittests.cc @@ -4,6 +4,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "base/threading/platform_thread.h" #include "gpu/command_buffer/tests/gl_manager.h" diff --git a/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc b/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc index 3ba05ba..175491e 100644 --- a/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc +++ b/gpu/command_buffer/tests/gl_texture_mailbox_unittests.cc @@ -4,6 +4,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include "gpu/command_buffer/service/mailbox_manager.h" #include "gpu/command_buffer/tests/gl_manager.h" diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 8594adc..4b6ebd3 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -3,8 +3,6 @@ /* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */ -#include <GLES2/gl2chromium.h> - #ifdef __cplusplus extern "C" { #endif @@ -1809,6 +1807,4 @@ typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); } #endif -#include <GLES2/gl2extchromium.h> - #endif /* __gl2ext_h_ */ diff --git a/webkit/DEPS b/webkit/DEPS index af9b6fc..f33a73d 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -30,6 +30,7 @@ include_rules = [ "+gpu/command_buffer/client", "+gpu/command_buffer/common", "+gpu/command_buffer/service", + "+gpu/GLES2", "+third_party/khronos/GLES2", # For shared USB keycode conversion tables used by ppapi plugin code. diff --git a/webkit/gpu/gl_bindings_skia_cmd_buffer.cc b/webkit/gpu/gl_bindings_skia_cmd_buffer.cc index d30afe3..8295723 100644 --- a/webkit/gpu/gl_bindings_skia_cmd_buffer.cc +++ b/webkit/gpu/gl_bindings_skia_cmd_buffer.cc @@ -7,6 +7,7 @@ #ifndef GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES #endif +#include "gpu/GLES2/gl2extchromium.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/gpu/gl/GrGLInterface.h" diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 9135827..48d882b 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -9,6 +9,7 @@ #define GL_GLEXT_PROTOTYPES 1 #endif #include <GLES2/gl2ext.h> +#include <GLES2/gl2extchromium.h> #include <algorithm> #include <set> |