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

Unified 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: Created 7 years, 8 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
Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 3f2b35586cd81322bc1768f33dfab76ec362e0dc..306e9204a689392aa18bdc8de381f4364665d9e2 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -67,7 +67,8 @@
'gl_context.h',
'gl_context_android.cc',
'gl_context_mac.mm',
- 'gl_context_osmesa.cc',
+ 'gl_context_nsl.mm',
jonathan.backer 2013/04/30 12:41:20 .mm? nix this?
rjkroege 2013/05/06 18:46:24 bad merge. fixed.
+ 'gl_context_osmesa.cc',
jonathan.backer 2013/04/30 12:41:20 nit: whitespace.
rjkroege 2013/05/06 18:46:24 Done.
'gl_context_osmesa.h',
'gl_context_stub.cc',
'gl_context_stub.h',
@@ -82,6 +83,7 @@
'gl_image.h',
'gl_image_android.cc',
'gl_image_mac.cc',
+ 'gl_image_nsl.cc',
'gl_image_stub.cc',
'gl_image_stub.h',
'gl_image_win.cc',
@@ -90,6 +92,7 @@
'gl_implementation.h',
'gl_implementation_android.cc',
'gl_implementation_mac.cc',
+ 'gl_implementation_nsl.cc',
'gl_implementation_win.cc',
'gl_implementation_x11.cc',
'gl_interface.cc',
@@ -104,6 +107,7 @@
'gl_surface.h',
'gl_surface_android.cc',
'gl_surface_mac.cc',
+ 'gl_surface_nsl.cc',
'gl_surface_stub.cc',
'gl_surface_stub.h',
'gl_surface_win.cc',
@@ -129,6 +133,24 @@
'<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
'<(gl_binding_output_dir)/gl_interface_autogen_gl.h',
],
+ 'target_conditions': [
+ ['<(use_native_surface_linux) == 1', {
+ 'sources!': [
+ 'gl_context_linux.cc',
+ 'gl_image_linux.cc',
+ 'gl_implementation_linux.cc',
+ 'gl_surface_linux.cc',
+ ],
+ },
+ { # use_native_surface_linux == 0
+ 'sources!': [
+ 'gl_context_nsl.cc',
+ 'gl_implementation_nsl.cc',
+ 'gl_surface_nsl.cc',
+ 'gl_image_nsl.cc',
+ ],
+ }],
+ ],
# 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

Powered by Google App Engine
This is Rietveld 408576698