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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/mesa/BUILD.gn

Issue 409423002: Add osmesa to GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « gpu/gpu.gyp ('k') | third_party/mesa/mesa.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mesa/BUILD.gn
diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn
index 753b46ad76c5fd3ce03039dd11f650151dcaba53..565a626061178ab58544f2d77dabf92aee3aa4d4 100644
--- a/third_party/mesa/BUILD.gn
+++ b/third_party/mesa/BUILD.gn
@@ -218,8 +218,10 @@ static_library("mesa_libglslcommon") {
"src/src/glsl/ralloc.h",
"src/src/glsl/s_expression.cpp",
"src/src/glsl/s_expression.h",
- "src/src/glsl/standalone_scaffolding.cpp",
- "src/src/glsl/standalone_scaffolding.h",
+ # Skipped in the GN build. This file duplicates symbols from errors.c and
+ # happens to link in GYP due to static library link ordering.
+ #"src/src/glsl/standalone_scaffolding.cpp",
+ #"src/src/glsl/standalone_scaffolding.h",
"src/src/glsl/strtod.c",
"src/src/glsl/strtod.h",
]
@@ -508,90 +510,92 @@ static_library("mesa") {
"src/src/mesa/program/string_to_uint_map.cpp",
"src/src/mesa/program/symbol_table.c",
"src/src/mesa/program/symbol_table.h",
- "src/src/mesa/state_tracker/st_atom.c",
- "src/src/mesa/state_tracker/st_atom.h",
- "src/src/mesa/state_tracker/st_atom_array.c",
- "src/src/mesa/state_tracker/st_atom_blend.c",
- "src/src/mesa/state_tracker/st_atom_clip.c",
- "src/src/mesa/state_tracker/st_atom_constbuf.c",
- "src/src/mesa/state_tracker/st_atom_constbuf.h",
- "src/src/mesa/state_tracker/st_atom_depth.c",
- "src/src/mesa/state_tracker/st_atom_framebuffer.c",
- "src/src/mesa/state_tracker/st_atom_msaa.c",
- "src/src/mesa/state_tracker/st_atom_pixeltransfer.c",
- "src/src/mesa/state_tracker/st_atom_rasterizer.c",
- "src/src/mesa/state_tracker/st_atom_sampler.c",
- "src/src/mesa/state_tracker/st_atom_scissor.c",
- "src/src/mesa/state_tracker/st_atom_shader.c",
- "src/src/mesa/state_tracker/st_atom_shader.h",
- "src/src/mesa/state_tracker/st_atom_stipple.c",
- "src/src/mesa/state_tracker/st_atom_texture.c",
- "src/src/mesa/state_tracker/st_atom_viewport.c",
- "src/src/mesa/state_tracker/st_cb_bitmap.c",
- "src/src/mesa/state_tracker/st_cb_bitmap.h",
- "src/src/mesa/state_tracker/st_cb_blit.c",
- "src/src/mesa/state_tracker/st_cb_blit.h",
- "src/src/mesa/state_tracker/st_cb_bufferobjects.c",
- "src/src/mesa/state_tracker/st_cb_bufferobjects.h",
- "src/src/mesa/state_tracker/st_cb_clear.c",
- "src/src/mesa/state_tracker/st_cb_clear.h",
- "src/src/mesa/state_tracker/st_cb_condrender.c",
- "src/src/mesa/state_tracker/st_cb_condrender.h",
- "src/src/mesa/state_tracker/st_cb_drawpixels.c",
- "src/src/mesa/state_tracker/st_cb_drawpixels.h",
- "src/src/mesa/state_tracker/st_cb_drawtex.c",
- "src/src/mesa/state_tracker/st_cb_drawtex.h",
- "src/src/mesa/state_tracker/st_cb_eglimage.c",
- "src/src/mesa/state_tracker/st_cb_eglimage.h",
- "src/src/mesa/state_tracker/st_cb_fbo.c",
- "src/src/mesa/state_tracker/st_cb_fbo.h",
- "src/src/mesa/state_tracker/st_cb_feedback.c",
- "src/src/mesa/state_tracker/st_cb_feedback.h",
- "src/src/mesa/state_tracker/st_cb_flush.c",
- "src/src/mesa/state_tracker/st_cb_flush.h",
- "src/src/mesa/state_tracker/st_cb_program.c",
- "src/src/mesa/state_tracker/st_cb_program.h",
- "src/src/mesa/state_tracker/st_cb_queryobj.c",
- "src/src/mesa/state_tracker/st_cb_queryobj.h",
- "src/src/mesa/state_tracker/st_cb_rasterpos.c",
- "src/src/mesa/state_tracker/st_cb_rasterpos.h",
- "src/src/mesa/state_tracker/st_cb_readpixels.c",
- "src/src/mesa/state_tracker/st_cb_readpixels.h",
- "src/src/mesa/state_tracker/st_cb_strings.c",
- "src/src/mesa/state_tracker/st_cb_strings.h",
- "src/src/mesa/state_tracker/st_cb_syncobj.c",
- "src/src/mesa/state_tracker/st_cb_syncobj.h",
- "src/src/mesa/state_tracker/st_cb_texture.c",
- "src/src/mesa/state_tracker/st_cb_texture.h",
- "src/src/mesa/state_tracker/st_cb_texturebarrier.c",
- "src/src/mesa/state_tracker/st_cb_texturebarrier.h",
- "src/src/mesa/state_tracker/st_cb_viewport.c",
- "src/src/mesa/state_tracker/st_cb_viewport.h",
- "src/src/mesa/state_tracker/st_cb_xformfb.c",
- "src/src/mesa/state_tracker/st_cb_xformfb.h",
- "src/src/mesa/state_tracker/st_context.c",
- "src/src/mesa/state_tracker/st_context.h",
- "src/src/mesa/state_tracker/st_debug.c",
- "src/src/mesa/state_tracker/st_debug.h",
- "src/src/mesa/state_tracker/st_draw.c",
- "src/src/mesa/state_tracker/st_draw.h",
- "src/src/mesa/state_tracker/st_draw_feedback.c",
- "src/src/mesa/state_tracker/st_extensions.c",
- "src/src/mesa/state_tracker/st_extensions.h",
- "src/src/mesa/state_tracker/st_format.c",
- "src/src/mesa/state_tracker/st_format.h",
- "src/src/mesa/state_tracker/st_gen_mipmap.c",
- "src/src/mesa/state_tracker/st_gen_mipmap.h",
- "src/src/mesa/state_tracker/st_glsl_to_tgsi.cpp",
- "src/src/mesa/state_tracker/st_glsl_to_tgsi.h",
- "src/src/mesa/state_tracker/st_manager.c",
- "src/src/mesa/state_tracker/st_manager.h",
- "src/src/mesa/state_tracker/st_mesa_to_tgsi.c",
- "src/src/mesa/state_tracker/st_mesa_to_tgsi.h",
- "src/src/mesa/state_tracker/st_program.c",
- "src/src/mesa/state_tracker/st_program.h",
- "src/src/mesa/state_tracker/st_texture.c",
- "src/src/mesa/state_tracker/st_texture.h",
+ # The state tracker files are removed from the GN build. They don't seem to
+ # be necessary for the build, and they seem to bring in extra symbols.
+ #"src/src/mesa/state_tracker/st_atom.c",
+ #"src/src/mesa/state_tracker/st_atom.h",
+ #"src/src/mesa/state_tracker/st_atom_array.c",
+ #"src/src/mesa/state_tracker/st_atom_blend.c",
+ #"src/src/mesa/state_tracker/st_atom_clip.c",
+ #"src/src/mesa/state_tracker/st_atom_constbuf.c",
+ #"src/src/mesa/state_tracker/st_atom_constbuf.h",
+ #"src/src/mesa/state_tracker/st_atom_depth.c",
+ #"src/src/mesa/state_tracker/st_atom_framebuffer.c",
+ #"src/src/mesa/state_tracker/st_atom_msaa.c",
+ #"src/src/mesa/state_tracker/st_atom_pixeltransfer.c",
+ #"src/src/mesa/state_tracker/st_atom_rasterizer.c",
+ #"src/src/mesa/state_tracker/st_atom_sampler.c",
+ #"src/src/mesa/state_tracker/st_atom_scissor.c",
+ #"src/src/mesa/state_tracker/st_atom_shader.c",
+ #"src/src/mesa/state_tracker/st_atom_shader.h",
+ #"src/src/mesa/state_tracker/st_atom_stipple.c",
+ #"src/src/mesa/state_tracker/st_atom_texture.c",
+ #"src/src/mesa/state_tracker/st_atom_viewport.c",
+ #"src/src/mesa/state_tracker/st_cb_bitmap.c",
+ #"src/src/mesa/state_tracker/st_cb_bitmap.h",
+ #"src/src/mesa/state_tracker/st_cb_blit.c",
+ #"src/src/mesa/state_tracker/st_cb_blit.h",
+ #"src/src/mesa/state_tracker/st_cb_bufferobjects.c",
+ #"src/src/mesa/state_tracker/st_cb_bufferobjects.h",
+ #"src/src/mesa/state_tracker/st_cb_clear.c",
+ #"src/src/mesa/state_tracker/st_cb_clear.h",
+ #"src/src/mesa/state_tracker/st_cb_condrender.c",
+ #"src/src/mesa/state_tracker/st_cb_condrender.h",
+ #"src/src/mesa/state_tracker/st_cb_drawpixels.c",
+ #"src/src/mesa/state_tracker/st_cb_drawpixels.h",
+ #"src/src/mesa/state_tracker/st_cb_drawtex.c",
+ #"src/src/mesa/state_tracker/st_cb_drawtex.h",
+ #"src/src/mesa/state_tracker/st_cb_eglimage.c",
+ #"src/src/mesa/state_tracker/st_cb_eglimage.h",
+ #"src/src/mesa/state_tracker/st_cb_fbo.c",
+ #"src/src/mesa/state_tracker/st_cb_fbo.h",
+ #"src/src/mesa/state_tracker/st_cb_feedback.c",
+ #"src/src/mesa/state_tracker/st_cb_feedback.h",
+ #"src/src/mesa/state_tracker/st_cb_flush.c",
+ #"src/src/mesa/state_tracker/st_cb_flush.h",
+ #"src/src/mesa/state_tracker/st_cb_program.c",
+ #"src/src/mesa/state_tracker/st_cb_program.h",
+ #"src/src/mesa/state_tracker/st_cb_queryobj.c",
+ #"src/src/mesa/state_tracker/st_cb_queryobj.h",
+ #"src/src/mesa/state_tracker/st_cb_rasterpos.c",
+ #"src/src/mesa/state_tracker/st_cb_rasterpos.h",
+ #"src/src/mesa/state_tracker/st_cb_readpixels.c",
+ #"src/src/mesa/state_tracker/st_cb_readpixels.h",
+ #"src/src/mesa/state_tracker/st_cb_strings.c",
+ #"src/src/mesa/state_tracker/st_cb_strings.h",
+ #"src/src/mesa/state_tracker/st_cb_syncobj.c",
+ #"src/src/mesa/state_tracker/st_cb_syncobj.h",
+ #"src/src/mesa/state_tracker/st_cb_texture.c",
+ #"src/src/mesa/state_tracker/st_cb_texture.h",
+ #"src/src/mesa/state_tracker/st_cb_texturebarrier.c",
+ #"src/src/mesa/state_tracker/st_cb_texturebarrier.h",
+ #"src/src/mesa/state_tracker/st_cb_viewport.c",
+ #"src/src/mesa/state_tracker/st_cb_viewport.h",
+ #"src/src/mesa/state_tracker/st_cb_xformfb.c",
+ #"src/src/mesa/state_tracker/st_cb_xformfb.h",
+ #"src/src/mesa/state_tracker/st_context.c",
+ #"src/src/mesa/state_tracker/st_context.h",
+ #"src/src/mesa/state_tracker/st_debug.c",
+ #"src/src/mesa/state_tracker/st_debug.h",
+ #"src/src/mesa/state_tracker/st_draw.c",
+ #"src/src/mesa/state_tracker/st_draw.h",
+ #"src/src/mesa/state_tracker/st_draw_feedback.c",
+ #"src/src/mesa/state_tracker/st_extensions.c",
+ #"src/src/mesa/state_tracker/st_extensions.h",
+ #"src/src/mesa/state_tracker/st_format.c",
+ #"src/src/mesa/state_tracker/st_format.h",
+ #"src/src/mesa/state_tracker/st_gen_mipmap.c",
+ #"src/src/mesa/state_tracker/st_gen_mipmap.h",
+ #"src/src/mesa/state_tracker/st_glsl_to_tgsi.cpp",
+ #"src/src/mesa/state_tracker/st_glsl_to_tgsi.h",
+ #"src/src/mesa/state_tracker/st_manager.c",
+ #"src/src/mesa/state_tracker/st_manager.h",
+ #"src/src/mesa/state_tracker/st_mesa_to_tgsi.c",
+ #"src/src/mesa/state_tracker/st_mesa_to_tgsi.h",
+ #"src/src/mesa/state_tracker/st_program.c",
+ #"src/src/mesa/state_tracker/st_program.h",
+ #"src/src/mesa/state_tracker/st_texture.c",
+ #"src/src/mesa/state_tracker/st_texture.h",
"src/src/mesa/swrast/s_aaline.c",
"src/src/mesa/swrast/s_aaline.h",
"src/src/mesa/swrast/s_aatriangle.c",
@@ -721,39 +725,43 @@ static_library("mesa") {
deps = [
":mesa_headers",
- ":mesa_libglslcommon",
]
}
+if (!is_android) { # TODO(GYP) enable for Android.
# Building this target will hide the native OpenGL shared library and
# replace it with a slow software renderer.
# TODO(GYP) http://crbug.com/380327 need support for loadable_module.
#loadable_module("osmesa") {
-# sources = [
-# "src/src/mesa/drivers/common/driverfuncs.c",
-# "src/src/mesa/drivers/common/driverfuncs.h",
-# "src/src/mesa/drivers/common/meta.c",
-# "src/src/mesa/drivers/common/meta.h",
-# "src/src/mesa/drivers/osmesa/osmesa.c",
-# "src/src/mesa/drivers/osmesa/osmesa.def",
-# ]
-#
-# configs -= [
-# "//build/config/compiler:chromium_code",
-# ]
-# configs += [
-# ":mesa_headers_config",
-# ":mesa_internal_config",
-# "//build/config/compiler:no_chromium_code",
-# ]
-#
-# include_dirs = [ "src/src/mesa/drivers" ]
-#
-# deps = [
-# ":mesa_headers",
-# ":mesa",
-# ]
-#}
+shared_library("osmesa") {
+ sources = [
+ "src/src/mesa/drivers/common/driverfuncs.c",
+ "src/src/mesa/drivers/common/driverfuncs.h",
+ "src/src/mesa/drivers/common/meta.c",
+ "src/src/mesa/drivers/common/meta.h",
+ "src/src/mesa/drivers/osmesa/osmesa.c",
+ "src/src/mesa/drivers/osmesa/osmesa.def",
+ ]
+
+ configs -= [
+ "//build/config/compiler:chromium_code",
+ ]
+ configs += [
+ ":mesa_headers_config",
+ ":mesa_internal_config",
+ "//build/config/compiler:no_chromium_code",
+ ]
+
+ include_dirs = [ "src/src/mesa/drivers" ]
+
+ deps = [
+ ":mesa_headers",
+ ":mesa",
+ ":mesa_libglslcommon",
+ ]
+}
+
+} # !is_android
# TODO(GYP) Android osmesa_in_lib_dir target.
« no previous file with comments | « gpu/gpu.gyp ('k') | third_party/mesa/mesa.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698