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

Side by Side Diff: ui/gl/gl.gyp

Issue 13886018: Add a factory and defines for native Linux surfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: vsync provider, better transport_dib, etc. Created 7 years, 7 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'targets': [ 10 'targets': [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 'android/surface_texture_bridge.h', 48 'android/surface_texture_bridge.h',
49 'android/surface_texture_listener.cc', 49 'android/surface_texture_listener.cc',
50 'android/surface_texture_listener.h', 50 'android/surface_texture_listener.h',
51 'gl_bindings.h', 51 'gl_bindings.h',
52 'gl_bindings_skia_in_process.cc', 52 'gl_bindings_skia_in_process.cc',
53 'gl_bindings_skia_in_process.h', 53 'gl_bindings_skia_in_process.h',
54 'gl_context.cc', 54 'gl_context.cc',
55 'gl_context.h', 55 'gl_context.h',
56 'gl_context_android.cc', 56 'gl_context_android.cc',
57 'gl_context_mac.mm', 57 'gl_context_mac.mm',
58 'gl_context_ozone.cc',
58 'gl_context_osmesa.cc', 59 'gl_context_osmesa.cc',
59 'gl_context_osmesa.h', 60 'gl_context_osmesa.h',
60 'gl_context_stub.cc', 61 'gl_context_stub.cc',
61 'gl_context_stub.h', 62 'gl_context_stub.h',
62 'gl_context_win.cc', 63 'gl_context_win.cc',
63 'gl_context_x11.cc', 64 'gl_context_x11.cc',
64 'gl_export.h', 65 'gl_export.h',
65 'gl_fence.cc', 66 'gl_fence.cc',
66 'gl_fence.h', 67 'gl_fence.h',
67 'gl_gl_api_implementation.cc', 68 'gl_gl_api_implementation.cc',
68 'gl_gl_api_implementation.h', 69 'gl_gl_api_implementation.h',
69 'gl_image.cc', 70 'gl_image.cc',
70 'gl_image.h', 71 'gl_image.h',
71 'gl_image_android.cc', 72 'gl_image_android.cc',
72 'gl_image_mac.cc', 73 'gl_image_mac.cc',
74 'gl_image_ozone.cc',
73 'gl_image_stub.cc', 75 'gl_image_stub.cc',
74 'gl_image_stub.h', 76 'gl_image_stub.h',
75 'gl_image_win.cc', 77 'gl_image_win.cc',
76 'gl_image_x11.cc', 78 'gl_image_x11.cc',
77 'gl_implementation.cc', 79 'gl_implementation.cc',
78 'gl_implementation.h', 80 'gl_implementation.h',
79 'gl_implementation_android.cc', 81 'gl_implementation_android.cc',
82 'gl_implementation_ozone.cc',
80 'gl_implementation_mac.cc', 83 'gl_implementation_mac.cc',
81 'gl_implementation_win.cc', 84 'gl_implementation_win.cc',
82 'gl_implementation_x11.cc', 85 'gl_implementation_x11.cc',
83 'gl_interface.cc', 86 'gl_interface.cc',
84 'gl_interface.h', 87 'gl_interface.h',
85 'gl_osmesa_api_implementation.cc', 88 'gl_osmesa_api_implementation.cc',
86 'gl_osmesa_api_implementation.h', 89 'gl_osmesa_api_implementation.h',
87 'gl_share_group.cc', 90 'gl_share_group.cc',
88 'gl_share_group.h', 91 'gl_share_group.h',
89 'gl_state_restorer.cc', 92 'gl_state_restorer.cc',
90 'gl_state_restorer.h', 93 'gl_state_restorer.h',
91 'gl_surface.cc', 94 'gl_surface.cc',
92 'gl_surface.h', 95 'gl_surface.h',
93 'gl_surface_android.cc', 96 'gl_surface_android.cc',
94 'gl_surface_mac.cc', 97 'gl_surface_mac.cc',
98 'gl_surface_ozone.cc',
95 'gl_surface_stub.cc', 99 'gl_surface_stub.cc',
96 'gl_surface_stub.h', 100 'gl_surface_stub.h',
97 'gl_surface_win.cc', 101 'gl_surface_win.cc',
98 'gl_surface_x11.cc', 102 'gl_surface_x11.cc',
99 'gl_surface_osmesa.cc', 103 'gl_surface_osmesa.cc',
100 'gl_surface_osmesa.h', 104 'gl_surface_osmesa.h',
101 'gl_switches.cc', 105 'gl_switches.cc',
102 'gl_switches.h', 106 'gl_switches.h',
103 'gpu_switching_manager.cc', 107 'gpu_switching_manager.cc',
104 'gpu_switching_manager.h', 108 'gpu_switching_manager.h',
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 ], 171 ],
168 'action': [ 172 'action': [
169 'python', 173 'python',
170 '<(generator_path)', 174 '<(generator_path)',
171 '--header-paths=<(header_paths)', 175 '--header-paths=<(header_paths)',
172 '<(gl_binding_output_dir)', 176 '<(gl_binding_output_dir)',
173 ], 177 ],
174 }, 178 },
175 ], 179 ],
176 'conditions': [ 180 'conditions': [
177 ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { 181 ['OS in ("win", "android", "linux")', {
rjkroege 2013/05/17 22:17:06 this looks like an error on my part. fixing.
rjkroege 2013/05/21 17:36:28 on double-checking, this change is indeed necessar
178 'sources': [ 182 'sources': [
179 'egl_util.cc', 183 'egl_util.cc',
180 'egl_util.h', 184 'egl_util.h',
181 'gl_context_egl.cc', 185 'gl_context_egl.cc',
182 'gl_context_egl.h', 186 'gl_context_egl.h',
183 'gl_surface_egl.cc', 187 'gl_surface_egl.cc',
184 'gl_surface_egl.h', 188 'gl_surface_egl.h',
185 'gl_egl_api_implementation.cc', 189 'gl_egl_api_implementation.cc',
186 'gl_egl_api_implementation.h', 190 'gl_egl_api_implementation.h',
187 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', 191 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 ], 346 ],
343 'variables': { 347 'variables': {
344 'jni_gen_package': 'ui/gl', 348 'jni_gen_package': 'ui/gl',
345 }, 349 },
346 'includes': [ '../../build/jni_generator.gypi' ], 350 'includes': [ '../../build/jni_generator.gypi' ],
347 }, 351 },
348 ], 352 ],
349 }], 353 }],
350 ], 354 ],
351 } 355 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698