Index: third_party/mesa/mesa.gyp |
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp |
index 4f13bde2ee4e68f1e358c45ae041bfbb0972c423..955bc80d4d2ad2a7d243dba65f5bd4e30a6d6270 100644 |
--- a/third_party/mesa/mesa.gyp |
+++ b/third_party/mesa/mesa.gyp |
@@ -3,20 +3,73 @@ |
# found in the LICENSE file. |
{ |
+ 'variables': { |
+ 'generated_src_dir': 'src/chromium_gensrc', |
+ }, |
'conditions': [ |
['use_system_mesa==0', { |
'target_defaults': { |
+ 'defines': [ |
+ 'MAPI_ABI_HEADER="glapi_mapi_tmp_shared.h"', |
+ "PACKAGE_NAME=\"Mesa\"", |
+ "PACKAGE_TARNAME=\"mesa\"", |
+ "PACKAGE_VERSION=\"9.0.3\"", |
+ "PACKAGE_STRING=\"Mesa\ 9.0.3\"", |
+ "PACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi\?product=Mesa\"", |
+ "PACKAGE_URL=\"\"", |
+ "PACKAGE=\"mesa\"", |
+ "VERSION=\"9.0.3\"", |
+ "STDC_HEADERS=1", |
+ "HAVE_SYS_TYPES_H=1", |
+ "HAVE_SYS_STAT_H=1", |
+ "HAVE_STDLIB_H=1", |
+ "HAVE_STRING_H=1", |
+ "HAVE_MEMORY_H=1", |
+ "HAVE_STRINGS_H=1", |
+ "HAVE_INTTYPES_H=1", |
+ "HAVE_STDINT_H=1", |
+ "HAVE_DLFCN_H=1", |
+ "LT_OBJDIR=\".libs/\"", |
+ "YYTEXT_POINTER=1", |
+ "HAVE_LIBEXPAT=1", |
+ "HAVE_LIBXCB_DRI2=1", |
+ "FEATURE_GL=1", |
+ 'MAPI_MODE_GLAPI', |
+ #"USE_X86_64_ASM", |
+ "IN_DRI_DRIVER", |
+ "USE_XCB", |
+ "GLX_INDIRECT_RENDERING", |
+ "GLX_DIRECT_RENDERING", |
+ "USE_EXTERNAL_DXTN_LIB=1", |
+ "IN_DRI_DRIVER", |
+ "HAVE_ALIAS", |
+ "HAVE_MINCORE", |
+ "HAVE_LIBUDEV", |
+ ], |
'conditions': [ |
- ['OS!="win"', { |
+ ['OS=="android"', { |
'defines': [ |
- # For talloc |
- 'HAVE_VA_COPY', |
+ '__GLIBC__', |
+ ], |
+ 'cflags': [ |
+ '-include assert.h', |
], |
}], |
- ['OS!="mac"', { |
+ ['OS=="linux"', { |
'defines': [ |
- # For talloc |
- 'HAVE_STRNLEN', |
+ '_GNU_SOURCE', |
+ ], |
+ }], |
+ ['os_posix == 1', { |
+ 'defines': [ |
+ 'HAVE_DLOPEN', |
+ 'HAVE_PTHREAD=1', |
+ 'HAVE_UNISTD_H=1', |
+ ], |
+ }], |
+ ['os_posix == 1 and OS != "android"', { |
+ 'defines': [ |
+ 'HAVE_POSIX_MEMALIGN', |
], |
}], |
['os_posix == 1 and OS != "mac" and OS != "android"', { |
@@ -24,10 +77,12 @@ |
'-fPIC', |
], |
}], |
- ], |
- 'defines': [ |
- # For Mesa |
- 'MAPI_GLAPI_CURRENT', |
+ ['OS=="win"', { |
+ # Pick up emulation headers not supported by Visual Studio. |
+ 'include_dirs': [ |
+ 'src/include/c99', |
+ ], |
+ }], |
], |
}, |
'targets': [ |
@@ -38,17 +93,33 @@ |
'include_dirs': [ |
'src/include', |
], |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS': [ |
+ '-Wno-unknown-pragmas', |
+ ], |
+ }, |
+ 'cflags': [ |
+ '-Wno-unknown-pragmas', |
+ ], |
}, |
}, |
{ |
- 'target_name': 'mesa', |
+ 'target_name': 'mesa_libglslcommon', |
'type': 'static_library', |
'include_dirs': [ |
- '../talloc', |
+ 'src/src/gallium/auxiliary', |
+ 'src/src/gallium/include', |
'src/src/glsl', |
+ 'src/src/glsl/glcpp', |
'src/src/mapi', |
+ 'src/src/mapi/glapi', |
'src/src/mesa', |
'src/src/mesa/main', |
+ 'src/include', |
+ '<(generated_src_dir)/mesa/', |
+ '<(generated_src_dir)/mesa/main', |
+ '<(generated_src_dir)/mesa/program', |
+ '<(generated_src_dir)/mesa/glapi', |
], |
'dependencies': [ |
'mesa_headers', |
@@ -56,22 +127,22 @@ |
# TODO(scottmg): http://crbug.com/143877 These should be removed if |
# Mesa is ever rolled and the warnings are fixed. |
'msvs_disabled_warnings': [ |
- 4005, 4018, 4065, 4090, 4099, 4113, 4133, 4146, 4267, 4273, 4291, |
- 4305, 4334, 4748, |
+ 4005, 4018, 4065, 4090, 4099, 4273, 4291, 4345, 4267, |
], |
'sources': [ |
- '../talloc/talloc.c', |
- 'src/src/glsl/ast.h', |
+ '<(generated_src_dir)/mesa/main/dispatch.h', |
'src/src/glsl/ast_expr.cpp', |
'src/src/glsl/ast_function.cpp', |
'src/src/glsl/ast_to_hir.cpp', |
'src/src/glsl/ast_type.cpp', |
- 'src/src/glsl/builtin_function.cpp', |
- 'src/src/glsl/builtin_types.h', |
- 'src/src/glsl/builtin_variables.h', |
- 'src/src/glsl/glsl_lexer.cpp', |
- 'src/src/glsl/glsl_parser.cpp', |
- 'src/src/glsl/glsl_parser.h', |
+ 'src/src/glsl/builtin_variables.cpp', |
+ '<(generated_src_dir)/mesa/glcpp-lex.c', |
+ '<(generated_src_dir)/mesa/glcpp-parse.c', |
+ '<(generated_src_dir)/mesa/glcpp-parse.h', |
+ 'src/src/glsl/glcpp/glcpp.h', |
+ 'src/src/glsl/glcpp/pp.c', |
+ '<(generated_src_dir)/mesa/glsl_lexer.cc', |
+ '<(generated_src_dir)/mesa/glsl_parser.cc', |
'src/src/glsl/glsl_parser_extras.cpp', |
'src/src/glsl/glsl_parser_extras.h', |
'src/src/glsl/glsl_symbol_table.cpp', |
@@ -81,37 +152,21 @@ |
'src/src/glsl/hir_field_selection.cpp', |
'src/src/glsl/ir.cpp', |
'src/src/glsl/ir.h', |
- 'src/src/glsl/ir_algebraic.cpp', |
'src/src/glsl/ir_basic_block.cpp', |
'src/src/glsl/ir_basic_block.h', |
+ 'src/src/glsl/ir_builder.cpp', |
+ 'src/src/glsl/ir_builder.h', |
'src/src/glsl/ir_clone.cpp', |
'src/src/glsl/ir_constant_expression.cpp', |
- 'src/src/glsl/ir_constant_folding.cpp', |
- 'src/src/glsl/ir_constant_propagation.cpp', |
- 'src/src/glsl/ir_constant_variable.cpp', |
- 'src/src/glsl/ir_copy_propagation.cpp', |
- 'src/src/glsl/ir_dead_code.cpp', |
- 'src/src/glsl/ir_dead_code_local.cpp', |
- 'src/src/glsl/ir_dead_functions.cpp', |
- 'src/src/glsl/ir_div_to_mul_rcp.cpp', |
- 'src/src/glsl/ir_explog_to_explog2.cpp', |
'src/src/glsl/ir_expression_flattening.cpp', |
'src/src/glsl/ir_expression_flattening.h', |
'src/src/glsl/ir_function.cpp', |
'src/src/glsl/ir_function_can_inline.cpp', |
- 'src/src/glsl/ir_function_inlining.cpp', |
- 'src/src/glsl/ir_function_inlining.h', |
+ 'src/src/glsl/ir_function_detect_recursion.cpp', |
'src/src/glsl/ir_hierarchical_visitor.cpp', |
'src/src/glsl/ir_hierarchical_visitor.h', |
'src/src/glsl/ir_hv_accept.cpp', |
- 'src/src/glsl/ir_if_simplification.cpp', |
- 'src/src/glsl/ir_if_to_cond_assign.cpp', |
'src/src/glsl/ir_import_prototypes.cpp', |
- 'src/src/glsl/ir_lower_jumps.cpp', |
- 'src/src/glsl/ir_mat_op_to_vec.cpp', |
- 'src/src/glsl/ir_mod_to_fract.cpp', |
- 'src/src/glsl/ir_noop_swizzle.cpp', |
- 'src/src/glsl/ir_optimization.h', |
'src/src/glsl/ir_print_visitor.cpp', |
'src/src/glsl/ir_print_visitor.h', |
'src/src/glsl/ir_reader.cpp', |
@@ -119,66 +174,131 @@ |
'src/src/glsl/ir_rvalue_visitor.cpp', |
'src/src/glsl/ir_rvalue_visitor.h', |
'src/src/glsl/ir_set_program_inouts.cpp', |
- 'src/src/glsl/ir_structure_splitting.cpp', |
- 'src/src/glsl/ir_sub_to_add_neg.cpp', |
- 'src/src/glsl/ir_swizzle_swizzle.cpp', |
- 'src/src/glsl/ir_tree_grafting.cpp', |
'src/src/glsl/ir_validate.cpp', |
- 'src/src/glsl/ir_variable.cpp', |
'src/src/glsl/ir_variable_refcount.cpp', |
'src/src/glsl/ir_variable_refcount.h', |
- 'src/src/glsl/ir_vec_index_to_cond_assign.cpp', |
- 'src/src/glsl/ir_vec_index_to_swizzle.cpp', |
- 'src/src/glsl/ir_visitor.h', |
'src/src/glsl/link_functions.cpp', |
+ 'src/src/glsl/link_uniform_initializers.cpp', |
+ 'src/src/glsl/link_uniforms.cpp', |
'src/src/glsl/linker.cpp', |
'src/src/glsl/linker.h', |
- 'src/src/glsl/list.h', |
'src/src/glsl/loop_analysis.cpp', |
'src/src/glsl/loop_analysis.h', |
'src/src/glsl/loop_controls.cpp', |
'src/src/glsl/loop_unroll.cpp', |
+ 'src/src/glsl/lower_clip_distance.cpp', |
+ 'src/src/glsl/lower_discard.cpp', |
+ 'src/src/glsl/lower_discard_flow.cpp', |
+ 'src/src/glsl/lower_if_to_cond_assign.cpp', |
+ 'src/src/glsl/lower_instructions.cpp', |
+ 'src/src/glsl/lower_jumps.cpp', |
+ 'src/src/glsl/lower_mat_op_to_vec.cpp', |
'src/src/glsl/lower_noise.cpp', |
+ 'src/src/glsl/lower_output_reads.cpp', |
+ 'src/src/glsl/lower_texture_projection.cpp', |
+ 'src/src/glsl/lower_ubo_reference.cpp', |
'src/src/glsl/lower_variable_index_to_cond_assign.cpp', |
+ 'src/src/glsl/lower_vec_index_to_cond_assign.cpp', |
+ 'src/src/glsl/lower_vec_index_to_swizzle.cpp', |
+ 'src/src/glsl/lower_vector.cpp', |
+ 'src/src/glsl/opt_algebraic.cpp', |
+ 'src/src/glsl/opt_array_splitting.cpp', |
+ 'src/src/glsl/opt_constant_folding.cpp', |
+ 'src/src/glsl/opt_constant_propagation.cpp', |
+ 'src/src/glsl/opt_constant_variable.cpp', |
+ 'src/src/glsl/opt_copy_propagation.cpp', |
+ 'src/src/glsl/opt_copy_propagation_elements.cpp', |
+ 'src/src/glsl/opt_dead_code.cpp', |
+ 'src/src/glsl/opt_dead_code_local.cpp', |
+ 'src/src/glsl/opt_dead_functions.cpp', |
+ 'src/src/glsl/opt_function_inlining.cpp', |
+ 'src/src/glsl/opt_if_simplification.cpp', |
+ 'src/src/glsl/opt_noop_swizzle.cpp', |
'src/src/glsl/opt_redundant_jumps.cpp', |
+ 'src/src/glsl/opt_structure_splitting.cpp', |
+ 'src/src/glsl/opt_swizzle_swizzle.cpp', |
+ 'src/src/glsl/opt_tree_grafting.cpp', |
'src/src/glsl/program.h', |
+ 'src/src/glsl/ralloc.c', |
+ 'src/src/glsl/ralloc.h', |
'src/src/glsl/s_expression.cpp', |
'src/src/glsl/s_expression.h', |
- 'src/src/glsl/safe_strcmp.c', |
- 'src/src/glsl/safe_strcmp.h', |
- 'src/src/glsl/glcpp/glcpp-lex.c', |
- 'src/src/glsl/glcpp/glcpp-parse.c', |
- 'src/src/glsl/glcpp/glcpp-parse.h', |
- 'src/src/glsl/glcpp/pp.c', |
- 'src/src/mapi/glapi/glapi.h', |
- 'src/src/mapi/glapi/glapi_dispatch.c', |
- 'src/src/mapi/glapi/glapi_entrypoint.c', |
- 'src/src/mapi/glapi/glapi_getproc.c', |
- 'src/src/mapi/glapi/glapi_nop.c', |
- 'src/src/mapi/glapi/glapi_priv.h', |
- 'src/src/mapi/glapi/glapidispatch.h', |
- 'src/src/mapi/glapi/glapioffsets.h', |
- 'src/src/mapi/glapi/glapitable.h', |
- 'src/src/mapi/glapi/glapitemp.h', |
- 'src/src/mapi/glapi/glprocs.h', |
- 'src/src/mapi/mapi/u_compiler.h', |
+ 'src/src/glsl/standalone_scaffolding.cpp', |
+ 'src/src/glsl/standalone_scaffolding.h', |
+ 'src/src/glsl/strtod.c', |
+ 'src/src/glsl/strtod.h', |
+ ], |
+ 'conditions': [ |
+ ['clang == 1', { |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS': [ |
+ '-Wno-tautological-constant-out-of-range-compare', |
+ ], |
+ 'WARNING_CFLAGS!': [ |
+ # Don't warn about string->bool used in asserts. |
+ '-Wstring-conversion', |
+ ], |
+ }, |
+ 'cflags': [ |
+ '-Wno-tautological-constant-out-of-range-compare', |
+ ], |
+ 'cflags!': [ |
+ '-Wstring-conversion', |
+ ], |
+ }], |
+ ], |
+ }, |
+ { |
+ 'target_name': 'mesa', |
+ 'type': 'static_library', |
+ 'include_dirs': [ |
+ 'src/src/gallium/auxiliary', |
+ 'src/src/gallium/include', |
+ 'src/src/glsl', |
+ 'src/src/glsl/glcpp', |
+ 'src/src/mapi', |
+ 'src/src/mapi/glapi', |
+ 'src/src/mesa', |
+ 'src/src/mesa/main', |
+ '<(generated_src_dir)/mesa/', |
+ '<(generated_src_dir)/mesa/main', |
+ '<(generated_src_dir)/mesa/program', |
+ '<(generated_src_dir)/mesa/glapi', |
+ ], |
+ 'dependencies': [ |
+ 'mesa_headers', |
+ 'mesa_libglslcommon', |
+ ], |
+ # TODO(scottmg): http://crbug.com/143877 These should be removed if |
+ # Mesa is ever rolled and the warnings are fixed. |
+ 'msvs_disabled_warnings': [ |
+ 4005, 4018, 4090, 4099, 4146, 4273, 4291, 4305, 4334, 4748, 4267, |
+ ], |
+ 'sources': [ |
+ '<(generated_src_dir)/mesa/builtin_function.cpp', |
+ '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', |
+ 'src/src/mapi/mapi/entry.c', |
+ 'src/src/mapi/mapi/entry.h', |
+ 'src/src/mapi/mapi/mapi.c', |
+ 'src/src/mapi/mapi/mapi.h', |
+ 'src/src/mapi/mapi/mapi_glapi.c', |
+ 'src/src/mapi/mapi/stub.c', |
+ 'src/src/mapi/mapi/stub.h', |
+ 'src/src/mapi/mapi/table.c', |
+ 'src/src/mapi/mapi/table.h', |
'src/src/mapi/mapi/u_current.c', |
'src/src/mapi/mapi/u_current.h', |
'src/src/mapi/mapi/u_execmem.c', |
'src/src/mapi/mapi/u_execmem.h', |
- 'src/src/mapi/mapi/u_macros.h', |
- 'src/src/mapi/mapi/u_thread.c', |
- 'src/src/mapi/mapi/u_thread.h', |
'src/src/mesa/main/accum.c', |
'src/src/mesa/main/accum.h', |
'src/src/mesa/main/api_arrayelt.c', |
'src/src/mesa/main/api_arrayelt.h', |
'src/src/mesa/main/api_exec.c', |
'src/src/mesa/main/api_exec.h', |
+ '<(generated_src_dir)/mesa/api_exec_es1.c', |
'src/src/mesa/main/api_loopback.c', |
'src/src/mesa/main/api_loopback.h', |
- 'src/src/mesa/main/api_noop.c', |
- 'src/src/mesa/main/api_noop.h', |
'src/src/mesa/main/api_validate.c', |
'src/src/mesa/main/api_validate.h', |
'src/src/mesa/main/arbprogram.c', |
@@ -189,7 +309,6 @@ |
'src/src/mesa/main/atifragshader.h', |
'src/src/mesa/main/attrib.c', |
'src/src/mesa/main/attrib.h', |
- 'src/src/mesa/main/bitset.h', |
'src/src/mesa/main/blend.c', |
'src/src/mesa/main/blend.h', |
'src/src/mesa/main/bufferobj.c', |
@@ -200,40 +319,34 @@ |
'src/src/mesa/main/clear.h', |
'src/src/mesa/main/clip.c', |
'src/src/mesa/main/clip.h', |
- 'src/src/mesa/main/colormac.h', |
'src/src/mesa/main/colortab.c', |
'src/src/mesa/main/colortab.h', |
- 'src/src/mesa/main/compiler.h', |
'src/src/mesa/main/condrender.c', |
'src/src/mesa/main/condrender.h', |
- 'src/src/mesa/main/config.h', |
'src/src/mesa/main/context.c', |
'src/src/mesa/main/context.h', |
'src/src/mesa/main/convolve.c', |
'src/src/mesa/main/convolve.h', |
- 'src/src/mesa/main/core.h', |
'src/src/mesa/main/cpuinfo.c', |
'src/src/mesa/main/cpuinfo.h', |
- 'src/src/mesa/main/dd.h', |
'src/src/mesa/main/debug.c', |
'src/src/mesa/main/debug.h', |
'src/src/mesa/main/depth.c', |
'src/src/mesa/main/depth.h', |
- 'src/src/mesa/main/depthstencil.c', |
- 'src/src/mesa/main/depthstencil.h', |
- 'src/src/mesa/main/dispatch.h', |
'src/src/mesa/main/dlist.c', |
'src/src/mesa/main/dlist.h', |
- 'src/src/mesa/main/dlopen.c', |
- 'src/src/mesa/main/dlopen.h', |
'src/src/mesa/main/drawpix.c', |
'src/src/mesa/main/drawpix.h', |
'src/src/mesa/main/drawtex.c', |
'src/src/mesa/main/drawtex.h', |
'src/src/mesa/main/enable.c', |
'src/src/mesa/main/enable.h', |
- 'src/src/mesa/main/enums.c', |
+ '<(generated_src_dir)/mesa/enums.c', |
'src/src/mesa/main/enums.h', |
+ 'src/src/mesa/main/errors.c', |
+ 'src/src/mesa/main/errors.h', |
+ 'src/src/mesa/main/es1_conversion.c', |
+ 'src/src/mesa/main/es1_conversion.h', |
'src/src/mesa/main/eval.c', |
'src/src/mesa/main/eval.h', |
'src/src/mesa/main/execmem.c', |
@@ -243,10 +356,15 @@ |
'src/src/mesa/main/fbobject.h', |
'src/src/mesa/main/feedback.c', |
'src/src/mesa/main/feedback.h', |
+ 'src/src/mesa/main/ff_fragment_shader.cpp', |
'src/src/mesa/main/ffvertex_prog.c', |
'src/src/mesa/main/ffvertex_prog.h', |
'src/src/mesa/main/fog.c', |
'src/src/mesa/main/fog.h', |
+ 'src/src/mesa/main/format_pack.c', |
+ 'src/src/mesa/main/format_pack.h', |
+ 'src/src/mesa/main/format_unpack.c', |
+ 'src/src/mesa/main/format_unpack.h', |
'src/src/mesa/main/formats.c', |
'src/src/mesa/main/formats.h', |
'src/src/mesa/main/framebuffer.c', |
@@ -254,7 +372,8 @@ |
'src/src/mesa/main/get.c', |
'src/src/mesa/main/get.h', |
'src/src/mesa/main/getstring.c', |
- 'src/src/mesa/main/glheader.h', |
+ 'src/src/mesa/main/glformats.c', |
+ 'src/src/mesa/main/glformats.h', |
'src/src/mesa/main/hash.c', |
'src/src/mesa/main/hash.h', |
'src/src/mesa/main/hint.c', |
@@ -269,27 +388,31 @@ |
'src/src/mesa/main/light.h', |
'src/src/mesa/main/lines.c', |
'src/src/mesa/main/lines.h', |
- 'src/src/mesa/main/macros.h', |
'src/src/mesa/main/matrix.c', |
'src/src/mesa/main/matrix.h', |
- 'src/src/mesa/main/mfeatures.h', |
'src/src/mesa/main/mipmap.c', |
'src/src/mesa/main/mipmap.h', |
'src/src/mesa/main/mm.c', |
'src/src/mesa/main/mm.h', |
- 'src/src/mesa/main/mtypes.h', |
'src/src/mesa/main/multisample.c', |
'src/src/mesa/main/multisample.h', |
'src/src/mesa/main/nvprogram.c', |
'src/src/mesa/main/nvprogram.h', |
+ 'src/src/mesa/main/pack.c', |
+ 'src/src/mesa/main/pack.h', |
+ 'src/src/mesa/main/pbo.c', |
+ 'src/src/mesa/main/pbo.h', |
'src/src/mesa/main/pixel.c', |
'src/src/mesa/main/pixel.h', |
'src/src/mesa/main/pixelstore.c', |
'src/src/mesa/main/pixelstore.h', |
+ 'src/src/mesa/main/pixeltransfer.c', |
+ 'src/src/mesa/main/pixeltransfer.h', |
'src/src/mesa/main/points.c', |
'src/src/mesa/main/points.h', |
'src/src/mesa/main/polygon.c', |
'src/src/mesa/main/polygon.h', |
+ 'src/src/mesa/main/querymatrix.c', |
'src/src/mesa/main/queryobj.c', |
'src/src/mesa/main/queryobj.h', |
'src/src/mesa/main/rastpos.c', |
@@ -298,18 +421,19 @@ |
'src/src/mesa/main/readpix.h', |
'src/src/mesa/main/remap.c', |
'src/src/mesa/main/remap.h', |
- 'src/src/mesa/main/remap_helper.h', |
'src/src/mesa/main/renderbuffer.c', |
'src/src/mesa/main/renderbuffer.h', |
+ 'src/src/mesa/main/samplerobj.c', |
+ 'src/src/mesa/main/samplerobj.h', |
'src/src/mesa/main/scissor.c', |
'src/src/mesa/main/scissor.h', |
+ 'src/src/mesa/main/shader_query.cpp', |
'src/src/mesa/main/shaderapi.c', |
'src/src/mesa/main/shaderapi.h', |
'src/src/mesa/main/shaderobj.c', |
'src/src/mesa/main/shaderobj.h', |
'src/src/mesa/main/shared.c', |
'src/src/mesa/main/shared.h', |
- 'src/src/mesa/main/simple_list.h', |
'src/src/mesa/main/state.c', |
'src/src/mesa/main/state.h', |
'src/src/mesa/main/stencil.c', |
@@ -318,17 +442,18 @@ |
'src/src/mesa/main/syncobj.h', |
'src/src/mesa/main/texcompress.c', |
'src/src/mesa/main/texcompress.h', |
+ 'src/src/mesa/main/texcompress_cpal.c', |
+ 'src/src/mesa/main/texcompress_cpal.h', |
+ 'src/src/mesa/main/texcompress_etc.c', |
+ 'src/src/mesa/main/texcompress_etc.h', |
'src/src/mesa/main/texcompress_fxt1.c', |
'src/src/mesa/main/texcompress_fxt1.h', |
+ 'src/src/mesa/main/texcompress_rgtc.c', |
+ 'src/src/mesa/main/texcompress_rgtc.h', |
'src/src/mesa/main/texcompress_s3tc.c', |
'src/src/mesa/main/texcompress_s3tc.h', |
'src/src/mesa/main/texenv.c', |
'src/src/mesa/main/texenv.h', |
- 'src/src/mesa/main/texenvprogram.c', |
- 'src/src/mesa/main/texenvprogram.h', |
- 'src/src/mesa/main/texfetch.c', |
- 'src/src/mesa/main/texfetch.h', |
- 'src/src/mesa/main/texfetch_tmp.h', |
'src/src/mesa/main/texformat.c', |
'src/src/mesa/main/texformat.h', |
'src/src/mesa/main/texgen.c', |
@@ -339,18 +464,19 @@ |
'src/src/mesa/main/teximage.h', |
'src/src/mesa/main/texobj.c', |
'src/src/mesa/main/texobj.h', |
- 'src/src/mesa/main/texpal.c', |
- 'src/src/mesa/main/texpal.h', |
'src/src/mesa/main/texparam.c', |
'src/src/mesa/main/texparam.h', |
- 'src/src/mesa/main/texrender.c', |
- 'src/src/mesa/main/texrender.h', |
'src/src/mesa/main/texstate.c', |
'src/src/mesa/main/texstate.h', |
+ 'src/src/mesa/main/texstorage.c', |
+ 'src/src/mesa/main/texstorage.h', |
'src/src/mesa/main/texstore.c', |
'src/src/mesa/main/texstore.h', |
+ 'src/src/mesa/main/texturebarrier.c', |
+ 'src/src/mesa/main/texturebarrier.h', |
'src/src/mesa/main/transformfeedback.c', |
'src/src/mesa/main/transformfeedback.h', |
+ 'src/src/mesa/main/uniform_query.cpp', |
'src/src/mesa/main/uniforms.c', |
'src/src/mesa/main/uniforms.h', |
'src/src/mesa/main/varray.c', |
@@ -361,35 +487,26 @@ |
'src/src/mesa/main/viewport.h', |
'src/src/mesa/main/vtxfmt.c', |
'src/src/mesa/main/vtxfmt.h', |
- 'src/src/mesa/main/vtxfmt_tmp.h', |
- 'src/src/mesa/math/m_clip_tmp.h', |
- 'src/src/mesa/math/m_copy_tmp.h', |
- 'src/src/mesa/math/m_debug.h', |
'src/src/mesa/math/m_debug_clip.c', |
'src/src/mesa/math/m_debug_norm.c', |
- 'src/src/mesa/math/m_debug_util.h', |
'src/src/mesa/math/m_debug_xform.c', |
- 'src/src/mesa/math/m_dotprod_tmp.h', |
'src/src/mesa/math/m_eval.c', |
'src/src/mesa/math/m_eval.h', |
'src/src/mesa/math/m_matrix.c', |
'src/src/mesa/math/m_matrix.h', |
- 'src/src/mesa/math/m_norm_tmp.h', |
- 'src/src/mesa/math/m_trans_tmp.h', |
'src/src/mesa/math/m_translate.c', |
'src/src/mesa/math/m_translate.h', |
'src/src/mesa/math/m_vector.c', |
'src/src/mesa/math/m_vector.h', |
'src/src/mesa/math/m_xform.c', |
'src/src/mesa/math/m_xform.h', |
- 'src/src/mesa/math/m_xform_tmp.h', |
'src/src/mesa/program/arbprogparse.c', |
'src/src/mesa/program/arbprogparse.h', |
'src/src/mesa/program/hash_table.c', |
'src/src/mesa/program/hash_table.h', |
'src/src/mesa/program/ir_to_mesa.cpp', |
'src/src/mesa/program/ir_to_mesa.h', |
- 'src/src/mesa/program/lex.yy.c', |
+ '<(generated_src_dir)/mesa/lex.yy.c', |
'src/src/mesa/program/nvfragparse.c', |
'src/src/mesa/program/nvfragparse.h', |
'src/src/mesa/program/nvvertparse.c', |
@@ -402,6 +519,7 @@ |
'src/src/mesa/program/prog_instruction.h', |
'src/src/mesa/program/prog_noise.c', |
'src/src/mesa/program/prog_noise.h', |
+ 'src/src/mesa/program/prog_opt_constant_fold.c', |
'src/src/mesa/program/prog_optimize.c', |
'src/src/mesa/program/prog_optimize.h', |
'src/src/mesa/program/prog_parameter.c', |
@@ -412,26 +530,108 @@ |
'src/src/mesa/program/prog_print.h', |
'src/src/mesa/program/prog_statevars.c', |
'src/src/mesa/program/prog_statevars.h', |
- 'src/src/mesa/program/prog_uniform.c', |
- 'src/src/mesa/program/prog_uniform.h', |
'src/src/mesa/program/program.c', |
'src/src/mesa/program/program.h', |
- 'src/src/mesa/program/program_parse.tab.c', |
- 'src/src/mesa/program/program_parse.tab.h', |
+ '<(generated_src_dir)/mesa/program/program_parse.tab.c', |
+ '<(generated_src_dir)/mesa/program/program_parse.tab.h', |
'src/src/mesa/program/program_parse_extra.c', |
- 'src/src/mesa/program/program_parser.h', |
'src/src/mesa/program/programopt.c', |
'src/src/mesa/program/programopt.h', |
+ 'src/src/mesa/program/register_allocate.c', |
+ 'src/src/mesa/program/register_allocate.h', |
+ 'src/src/mesa/program/sampler.cpp', |
+ 'src/src/mesa/program/sampler.h', |
+ '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', |
'src/src/mesa/swrast/s_aaline.c', |
'src/src/mesa/swrast/s_aaline.h', |
- 'src/src/mesa/swrast/s_aalinetemp.h', |
'src/src/mesa/swrast/s_aatriangle.c', |
'src/src/mesa/swrast/s_aatriangle.h', |
- 'src/src/mesa/swrast/s_aatritemp.h', |
- 'src/src/mesa/swrast/s_accum.c', |
- 'src/src/mesa/swrast/s_accum.h', |
'src/src/mesa/swrast/s_alpha.c', |
'src/src/mesa/swrast/s_alpha.h', |
'src/src/mesa/swrast/s_atifragshader.c', |
@@ -455,53 +655,46 @@ |
'src/src/mesa/swrast/s_fragprog.h', |
'src/src/mesa/swrast/s_lines.c', |
'src/src/mesa/swrast/s_lines.h', |
- 'src/src/mesa/swrast/s_linetemp.h', |
'src/src/mesa/swrast/s_logic.c', |
'src/src/mesa/swrast/s_logic.h', |
'src/src/mesa/swrast/s_masking.c', |
'src/src/mesa/swrast/s_masking.h', |
'src/src/mesa/swrast/s_points.c', |
'src/src/mesa/swrast/s_points.h', |
- 'src/src/mesa/swrast/s_readpix.c', |
+ 'src/src/mesa/swrast/s_renderbuffer.c', |
+ 'src/src/mesa/swrast/s_renderbuffer.h', |
'src/src/mesa/swrast/s_span.c', |
'src/src/mesa/swrast/s_span.h', |
- 'src/src/mesa/swrast/s_spantemp.h', |
'src/src/mesa/swrast/s_stencil.c', |
'src/src/mesa/swrast/s_stencil.h', |
'src/src/mesa/swrast/s_texcombine.c', |
'src/src/mesa/swrast/s_texcombine.h', |
+ 'src/src/mesa/swrast/s_texfetch.c', |
+ 'src/src/mesa/swrast/s_texfetch.h', |
'src/src/mesa/swrast/s_texfilter.c', |
'src/src/mesa/swrast/s_texfilter.h', |
+ 'src/src/mesa/swrast/s_texrender.c', |
+ 'src/src/mesa/swrast/s_texture.c', |
'src/src/mesa/swrast/s_triangle.c', |
'src/src/mesa/swrast/s_triangle.h', |
- 'src/src/mesa/swrast/s_trispan.h', |
- 'src/src/mesa/swrast/s_tritemp.h', |
'src/src/mesa/swrast/s_zoom.c', |
'src/src/mesa/swrast/s_zoom.h', |
- 'src/src/mesa/swrast/swrast.h', |
'src/src/mesa/swrast_setup/ss_context.c', |
'src/src/mesa/swrast_setup/ss_context.h', |
'src/src/mesa/swrast_setup/ss_triangle.c', |
'src/src/mesa/swrast_setup/ss_triangle.h', |
- 'src/src/mesa/swrast_setup/ss_tritmp.h', |
- 'src/src/mesa/swrast_setup/ss_vb.h', |
- 'src/src/mesa/swrast_setup/swrast_setup.h', |
'src/src/mesa/tnl/t_context.c', |
'src/src/mesa/tnl/t_context.h', |
'src/src/mesa/tnl/t_draw.c', |
'src/src/mesa/tnl/t_pipeline.c', |
'src/src/mesa/tnl/t_pipeline.h', |
'src/src/mesa/tnl/t_rasterpos.c', |
- 'src/src/mesa/tnl/t_vb_cliptmp.h', |
- 'src/src/mesa/tnl/t_vb_cull.c', |
'src/src/mesa/tnl/t_vb_fog.c', |
'src/src/mesa/tnl/t_vb_light.c', |
- 'src/src/mesa/tnl/t_vb_lighttmp.h', |
'src/src/mesa/tnl/t_vb_normals.c', |
'src/src/mesa/tnl/t_vb_points.c', |
'src/src/mesa/tnl/t_vb_program.c', |
'src/src/mesa/tnl/t_vb_render.c', |
- 'src/src/mesa/tnl/t_vb_rendertmp.h', |
'src/src/mesa/tnl/t_vb_texgen.c', |
'src/src/mesa/tnl/t_vb_texmat.c', |
'src/src/mesa/tnl/t_vb_vertex.c', |
@@ -511,10 +704,6 @@ |
'src/src/mesa/tnl/t_vertex_sse.c', |
'src/src/mesa/tnl/t_vp_build.c', |
'src/src/mesa/tnl/t_vp_build.h', |
- 'src/src/mesa/tnl/tnl.h', |
- 'src/src/mesa/vbo/vbo.h', |
- 'src/src/mesa/vbo/vbo_attrib.h', |
- 'src/src/mesa/vbo/vbo_attrib_tmp.h', |
'src/src/mesa/vbo/vbo_context.c', |
'src/src/mesa/vbo/vbo_context.h', |
'src/src/mesa/vbo/vbo_exec.c', |
@@ -523,6 +712,9 @@ |
'src/src/mesa/vbo/vbo_exec_array.c', |
'src/src/mesa/vbo/vbo_exec_draw.c', |
'src/src/mesa/vbo/vbo_exec_eval.c', |
+ 'src/src/mesa/vbo/vbo_noop.c', |
+ 'src/src/mesa/vbo/vbo_noop.h', |
+ 'src/src/mesa/vbo/vbo_primitive_restart.c', |
'src/src/mesa/vbo/vbo_rebase.c', |
'src/src/mesa/vbo/vbo_save.c', |
'src/src/mesa/vbo/vbo_save.h', |
@@ -533,16 +725,14 @@ |
'src/src/mesa/vbo/vbo_split.h', |
'src/src/mesa/vbo/vbo_split_copy.c', |
'src/src/mesa/vbo/vbo_split_inplace.c', |
+ 'src/src/mesa/x86-64/x86-64.c', |
+ 'src/src/mesa/x86-64/x86-64.h', |
], |
'conditions': [ |
['clang == 1', { |
'xcode_settings': { |
'WARNING_CFLAGS': [ |
- # Several functions ignore the result of talloc_steal(). |
- '-Wno-unused-value', |
- # texenvprogram.c converts '~0' to a bitfield, which causes clang |
- # to warn that -1 is implicitly converted to 255. |
- '-Wno-constant-conversion', |
+ '-Wno-tautological-constant-out-of-range-compare', |
], |
'WARNING_CFLAGS!': [ |
# Don't warn about string->bool used in asserts. |
@@ -550,8 +740,7 @@ |
], |
}, |
'cflags': [ |
- '-Wno-unused-value', |
- '-Wno-constant-conversion', |
+ '-Wno-tautological-constant-out-of-range-compare', |
], |
'cflags!': [ |
'-Wstring-conversion', |
@@ -565,6 +754,12 @@ |
'-fno-builtin-sin', |
], |
}], |
+ ['OS=="win"', { |
+ 'defines': [ |
+ # Because we're building as a static library |
+ '_GLAPI_NO_EXPORTS', |
+ ], |
+ }], |
], |
}, |
# Building this target will hide the native OpenGL shared library and |
@@ -577,11 +772,17 @@ |
'mesa_headers', |
'mesa', |
], |
- # Fixes link problems on Mac OS X with missing __cxa_pure_virtual. |
+ 'xcode_settings': { |
+ 'OTHER_LDFLAGS': [ |
+ '-lstdc++', |
+ ], |
+ }, |
'conditions': [ |
- ['OS=="mac"', { |
- 'sources': [ |
- 'src/src/mesa/drivers/osmesa/empty.cpp', |
+ ['OS=="win"', { |
+ 'defines': [ |
+ 'BUILD_GL32', |
+ 'KEYWORD1=GLAPI', |
+ 'KEYWORD2=GLAPIENTRY', |
], |
}], |
], |
@@ -589,11 +790,10 @@ |
'src/src/mapi', |
'src/src/mesa', |
'src/src/mesa/drivers', |
+ '<(generated_src_dir)/mesa', |
], |
- # TODO(scottmg): http://crbug.com/143877 These should be removed if |
- # Mesa is ever rolled and the warnings are fixed. |
'msvs_disabled_warnings': [ |
- 4005, 4133, 4267, |
+ 4005, 4018, 4065, 4090, 4099, 4273, 4291, 4345, 4267, |
], |
'sources': [ |
'src/src/mesa/drivers/common/driverfuncs.c', |
@@ -612,24 +812,19 @@ |
'target_name': 'mesa_headers', |
'type': 'none', |
'variables': { |
- 'headers_root_path': 'src/include', |
+ 'headers_root_path': 'include', |
# This list can easily be updated using the command below: |
- # find third_party/mesa/src/include -iname '*.h' \ |
- # -printf "'%p',\n" | grep -v internal | sed -e \ |
- # 's|third_party/mesa/src/include/||' | sort -u |
+ # find third_party/mesa/include -iname '*.h' -printf \ |
+ # "'%p',\n" | grep -v internal | grep "/GL/" | sed -e \ |
+ # 's|third_party/mesa/include/||' | sort -u |
'header_filenames': [ |
- 'GL/glext.h', |
- 'GL/glfbdev.h', |
'GL/gl.h', |
'GL/gl_mangle.h', |
- 'GL/glu.h', |
- 'GL/glu_mangle.h', |
- 'GL/glxext.h', |
+ 'GL/glext.h', |
'GL/glx.h', |
'GL/glx_mangle.h', |
- 'GL/mesa_wgl.h', |
+ 'GL/glxext.h', |
'GL/osmesa.h', |
- 'GL/vms_x_fix.h', |
'GL/wglext.h', |
'GL/wmesa.h', |
], |