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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl.gyp

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« shell/BUILD.gn ('K') | « ui/gl/generate_bindings.py ('k') | ui/gl/gl_bindings_api_autogen_egl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index f11f40c7d502bf461f1886c1094b4b4d3f153806..93c4d2b046fd577c9271c7b752869ff878a31b73 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -21,22 +21,13 @@
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
- 'variables': {
- 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
- },
'defines': [
'GL_IMPLEMENTATION',
],
'include_dirs': [
'<(DEPTH)/third_party/swiftshader/include',
'<(DEPTH)/third_party/khronos',
- '<(gl_binding_output_dir)',
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(gl_binding_output_dir)',
- ],
- },
'export_dependent_settings': [
'<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
],
@@ -50,12 +41,17 @@
'android/surface_texture_listener.cc',
'android/surface_texture_listener.h',
'gl_bindings.h',
+ 'gl_bindings_autogen_gl.cc',
+ 'gl_bindings_autogen_gl.h',
+ 'gl_bindings_autogen_osmesa.cc',
+ 'gl_bindings_autogen_osmesa.h',
'gl_bindings_skia_in_process.cc',
'gl_bindings_skia_in_process.h',
'gl_context.cc',
'gl_context.h',
'gl_context_android.cc',
'gl_context_mac.mm',
+ 'gl_context_ozone.cc',
'gl_context_osmesa.cc',
'gl_context_osmesa.h',
'gl_context_stub.cc',
@@ -64,6 +60,9 @@
'gl_context_stub_with_extensions.h',
'gl_context_win.cc',
'gl_context_x11.cc',
+ 'gl_enums.cc',
+ 'gl_enums.h',
+ 'gl_enums_implementation_autogen.h',
'gl_export.h',
'gl_fence.cc',
'gl_fence.h',
@@ -85,6 +84,7 @@
'gl_implementation.cc',
'gl_implementation.h',
'gl_implementation_android.cc',
+ 'gl_implementation_ozone.cc',
'gl_implementation_mac.cc',
'gl_implementation_win.cc',
'gl_implementation_x11.cc',
@@ -104,6 +104,7 @@
'gl_surface_x11.cc',
'gl_surface_osmesa.cc',
'gl_surface_osmesa.h',
+ 'gl_surface_ozone.cc',
'gl_switches.cc',
'gl_switches.h',
'gl_version_info.cc',
@@ -117,61 +118,14 @@
'scoped_make_current.h',
'sync_control_vsync_provider.cc',
'sync_control_vsync_provider.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
- ],
- # hard_dependency is necessary for this target because it has actions
- # that generate header files included by dependent targets. The header
- # files must be generated before the dependents are compiled. The usual
- # semantics are to allow the two targets to build concurrently.
- 'hard_dependency': 1,
- 'actions': [
- {
- 'action_name': 'generate_gl_bindings',
- 'variables': {
- 'generator_path': 'generate_bindings.py',
- # Prefer khronos EGL/GLES headers by listing that path first.
- 'header_paths': '../../third_party/khronos:../../third_party/mesa/src/include:.:../../gpu',
- },
- 'inputs': [
- '<(generator_path)',
- '<!@(python <(generator_path) --header-paths=<(header_paths) --inputs)',
- ],
- 'outputs': [
- '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
- '<(gl_binding_output_dir)/gl_bindings_api_autogen_egl.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h',
- '<(gl_binding_output_dir)/gl_bindings_api_autogen_gl.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h',
- '<(gl_binding_output_dir)/gl_bindings_api_autogen_glx.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_mock.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
- '<(gl_binding_output_dir)/gl_bindings_api_autogen_osmesa.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
- '<(gl_binding_output_dir)/gl_bindings_api_autogen_wgl.h',
- '<(gl_binding_output_dir)/gl_mock_autogen_gl.h',
- ],
- 'action': [
- 'python',
- '<(generator_path)',
- '--header-paths=<(header_paths)',
- '<(gl_binding_output_dir)',
- ],
- },
],
'conditions': [
['OS in ("win", "android", "linux")', {
'sources': [
'egl_util.cc',
'egl_util.h',
+ 'gl_bindings_autogen_egl.cc',
+ 'gl_bindings_autogen_egl.h',
'gl_context_egl.cc',
'gl_context_egl.h',
'gl_fence_egl.cc',
@@ -182,8 +136,6 @@
'gl_surface_egl.h',
'gl_egl_api_implementation.cc',
'gl_egl_api_implementation.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
],
'include_dirs': [
'<(DEPTH)/third_party/khronos',
@@ -203,6 +155,8 @@
}],
['use_x11 == 1', {
'sources': [
+ 'gl_bindings_autogen_glx.cc',
+ 'gl_bindings_autogen_glx.h',
'gl_context_glx.cc',
'gl_context_glx.h',
'gl_glx_api_implementation.cc',
@@ -213,8 +167,6 @@
'gl_surface_glx.h',
'gl_egl_api_implementation.cc',
'gl_egl_api_implementation.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h',
],
'all_dependent_settings': {
'defines': [
@@ -231,6 +183,8 @@
}],
['OS=="win"', {
'sources': [
+ 'gl_bindings_autogen_wgl.cc',
+ 'gl_bindings_autogen_wgl.h',
'gl_context_wgl.cc',
'gl_context_wgl.h',
'gl_egl_api_implementation.cc',
@@ -239,8 +193,6 @@
'gl_surface_wgl.h',
'gl_wgl_api_implementation.cc',
'gl_wgl_api_implementation.h',
- '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
],
'msvs_settings': {
'VCLinkerTool': {
@@ -300,6 +252,12 @@
['OS!="android"', {
'sources/': [ ['exclude', '^android/'] ],
}],
+ ['use_ozone==1', {
+ 'dependencies': [
+ '../ozone/ozone.gyp:ozone',
+ '../ozone/ozone.gyp:ozone_base',
+ ],
+ }],
['OS=="android" and android_webview_build==0', {
'dependencies': [
'../android/ui_android.gyp:ui_java',
@@ -310,29 +268,20 @@
{
'target_name': 'gl_unittest_utils',
'type': 'static_library',
- 'variables': {
- 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
- },
'dependencies': [
'../../testing/gmock.gyp:gmock',
'../../third_party/khronos/khronos.gyp:khronos_headers',
'gl',
],
'include_dirs': [
- '<(gl_binding_output_dir)',
'../..',
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(gl_binding_output_dir)',
- ],
- },
'sources': [
+ 'gl_bindings_autogen_mock.cc',
+ 'gl_bindings_autogen_mock.h',
+ 'gl_mock_autogen_gl.h',
'gl_mock.h',
'gl_mock.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc',
- '<(gl_binding_output_dir)/gl_bindings_autogen_mock.h',
- '<(gl_binding_output_dir)/gl_mock_autogen_gl.h',
],
},
],
« shell/BUILD.gn ('K') | « ui/gl/generate_bindings.py ('k') | ui/gl/gl_bindings_api_autogen_egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698