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

Unified Diff: ui/gl/gl.gyp

Issue 10543125: gpu: Add support for GLX_EXT_texture_from_pixmap extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add kGLImplementationMockGL case to gl_image_android.cc. Created 8 years, 2 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
« no previous file with comments | « third_party/khronos/README.chromium ('k') | ui/gl/gl_image.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 85e43033541f5e94d47111ba9e65e0c302882460..32d5e69b776f228b726e3df79c842d52977968b2 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -53,6 +53,14 @@
'gl_export.h',
'gl_fence.cc',
'gl_fence.h',
+ 'gl_image.cc',
+ 'gl_image.h',
+ 'gl_image_android.cc',
+ 'gl_image_linux.cc',
+ 'gl_image_mac.cc',
+ 'gl_image_stub.cc',
+ 'gl_image_stub.h',
+ 'gl_image_win.cc',
'gl_implementation.cc',
'gl_implementation.h',
'gl_implementation_android.cc',
@@ -143,6 +151,8 @@
'sources': [
'gl_context_glx.cc',
'gl_context_glx.h',
+ 'gl_image_glx.cc',
+ 'gl_image_glx.h',
'gl_surface_glx.cc',
'gl_surface_glx.h',
'<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
@@ -153,6 +163,12 @@
'GL_GLEXT_PROTOTYPES',
],
},
+ 'link_settings': {
+ 'libraries': [
+ '-lX11',
+ '-lXcomposite',
+ ],
+ },
}],
['OS=="win"', {
'sources': [
« no previous file with comments | « third_party/khronos/README.chromium ('k') | ui/gl/gl_image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698