Changes since v1 include: - brw_eu_defines.h split and associated fixes Split it not perfect, but I think is reasonable for the time being.
i965: remove unused macros from brw_defines.h i965: move brw_define.h ifndef guard to the top i965: add missing #include <assert.h> in brw_inst.h i965: add missing brw_defines.h include in brw_program.c i965: add missing brw_defines.h include in brw_program.c util/bitscan: use correct signature for ffs/ffsll i965: split EU defines to brw_eu_defines.h - removed i965_dri configure dependency when building ANV configure.ac: do not require the i965 driver for ANV - updated includes to be consistent and hence, dropped unneeded -I from the - android build should be fixed - reword the test_eu_compact commit message The lot is available in https://github.com/evelikov/Mesa/commits/compiler-move-v2 Cheers, Emil Emil Velikov (18): wayland: move .gitignore where applicable configure.ac: provide a fall-back define for WAYLAND_SCANNER radv/wsi: Don't include wayland headers i965: remove unused brw_cs.h include i965: remove dead brw_new_shader() declaration i965: remove duplicate declaration of brw_mark_surface_used i965: remove unused brw_program.h include i965: remove unused macros from brw_defines.h i965: move brw_define.h ifndef guard to the top i965: add missing #include <assert.h> in brw_inst.h i965: add missing brw_defines.h include in brw_program.c i965: add missing brw_defines.h include in brw_program.c util/bitscan: use correct signature for ffs/ffsll i965: split EU defines to brw_eu_defines.h i965: remove i965_symbols_test reference from .gitignore intel/compiler: link all tests again gtest, even test_eu_compact" intel/compiler: whitespace cleanups configure.ac: do not require the i965 driver for ANV Jason Ekstrand (7): anv/wsi: Don't include wayland headers vulkan/wsi: Generate wayland protocol headers separately from EGL intel/isl: Stop linking libi965_compiler.la into tests anv: Stop including brw_context.h i965: Move the back-end compiler to src/intel/compiler intel/tools: Use a makefile included from intel/Makefile.am intel/vulkan: Get rid of recursive make configure.ac | 11 +- src/Makefile.am | 9 - src/amd/vulkan/Makefile.am | 3 - src/amd/vulkan/radv_wsi_wayland.c | 3 - src/egl/wayland/{ => wayland-drm}/.gitignore | 0 src/intel/Android.blorp.mk | 2 +- .../Android.gen.mk => intel/Android.compiler.mk} | 41 +- src/intel/Android.isl.mk | 5 +- src/intel/Android.mk | 3 +- src/intel/{vulkan/Android.mk => Android.vulkan.mk} | 29 +- src/intel/Makefile.am | 14 +- src/intel/Makefile.compiler.am | 107 ++ src/intel/Makefile.isl.am | 1 - src/intel/Makefile.sources | 155 +++ src/intel/{tools/Makefile.am => Makefile.tools.am} | 56 +- src/intel/Makefile.vulkan.am | 220 ++++ src/intel/blorp/blorp.c | 4 +- src/intel/blorp/blorp_clear.c | 2 +- src/intel/blorp/blorp_priv.h | 2 +- .../drivers/dri/i965 => intel/compiler}/.gitignore | 9 +- .../dri/i965 => intel/compiler}/brw_cfg.cpp | 0 .../drivers/dri/i965 => intel/compiler}/brw_cfg.h | 0 .../dri/i965 => intel/compiler}/brw_compiler.c | 0 .../dri/i965 => intel/compiler}/brw_compiler.h | 0 .../compiler}/brw_dead_control_flow.cpp | 0 .../compiler}/brw_dead_control_flow.h | 0 .../dri/i965 => intel/compiler}/brw_disasm.c | 2 +- .../drivers/dri/i965 => intel/compiler}/brw_eu.c | 2 +- .../drivers/dri/i965 => intel/compiler}/brw_eu.h | 2 +- .../dri/i965 => intel/compiler}/brw_eu_compact.c | 0 src/intel/compiler/brw_eu_defines.h | 1246 ++++++++++++++++++++ .../dri/i965 => intel/compiler}/brw_eu_emit.c | 2 +- .../dri/i965 => intel/compiler}/brw_eu_util.c | 6 +- .../dri/i965 => intel/compiler}/brw_eu_validate.c | 0 .../drivers/dri/i965 => intel/compiler}/brw_fs.cpp | 2 - .../drivers/dri/i965 => intel/compiler}/brw_fs.h | 0 .../dri/i965 => intel/compiler}/brw_fs_builder.h | 0 .../compiler}/brw_fs_cmod_propagation.cpp | 0 .../compiler}/brw_fs_combine_constants.cpp | 0 .../compiler}/brw_fs_copy_propagation.cpp | 0 .../dri/i965 => intel/compiler}/brw_fs_cse.cpp | 0 .../compiler}/brw_fs_dead_code_eliminate.cpp | 0 .../i965 => intel/compiler}/brw_fs_generator.cpp | 1 - .../compiler}/brw_fs_live_variables.cpp | 0 .../compiler}/brw_fs_live_variables.h | 0 .../i965 => intel/compiler}/brw_fs_lower_d2x.cpp | 0 .../i965 => intel/compiler}/brw_fs_lower_pack.cpp | 0 .../dri/i965 => intel/compiler}/brw_fs_nir.cpp | 1 - .../compiler}/brw_fs_reg_allocate.cpp | 0 .../compiler}/brw_fs_register_coalesce.cpp | 0 .../compiler}/brw_fs_saturate_propagation.cpp | 0 .../compiler}/brw_fs_sel_peephole.cpp | 0 .../compiler}/brw_fs_surface_builder.cpp | 0 .../compiler}/brw_fs_surface_builder.h | 0 .../i965 => intel/compiler}/brw_fs_validate.cpp | 0 .../dri/i965 => intel/compiler}/brw_fs_visitor.cpp | 0 .../drivers/dri/i965 => intel/compiler}/brw_inst.h | 3 +- .../compiler}/brw_interpolation_map.c | 0 .../dri/i965 => intel/compiler}/brw_ir_allocator.h | 0 .../dri/i965 => intel/compiler}/brw_ir_fs.h | 0 .../dri/i965 => intel/compiler}/brw_ir_vec4.h | 0 .../drivers/dri/i965 => intel/compiler}/brw_nir.c | 0 .../drivers/dri/i965 => intel/compiler}/brw_nir.h | 0 .../compiler}/brw_nir_analyze_boolean_resolves.c | 0 .../compiler}/brw_nir_attribute_workarounds.c | 0 .../i965 => intel/compiler}/brw_nir_intrinsics.c | 0 .../compiler}/brw_nir_opt_peephole_ffma.c | 0 .../compiler}/brw_nir_tcs_workarounds.c | 0 .../compiler}/brw_nir_trig_workarounds.py | 0 .../dri/i965 => intel/compiler}/brw_packed_float.c | 0 .../compiler}/brw_predicated_break.cpp | 0 .../drivers/dri/i965 => intel/compiler}/brw_reg.h | 2 +- .../compiler}/brw_schedule_instructions.cpp | 0 .../dri/i965 => intel/compiler}/brw_shader.cpp | 0 .../dri/i965 => intel/compiler}/brw_shader.h | 2 +- .../dri/i965 => intel/compiler}/brw_vec4.cpp | 0 .../drivers/dri/i965 => intel/compiler}/brw_vec4.h | 1 - .../dri/i965 => intel/compiler}/brw_vec4_builder.h | 0 .../compiler}/brw_vec4_cmod_propagation.cpp | 0 .../compiler}/brw_vec4_copy_propagation.cpp | 0 .../dri/i965 => intel/compiler}/brw_vec4_cse.cpp | 0 .../compiler}/brw_vec4_dead_code_eliminate.cpp | 0 .../i965 => intel/compiler}/brw_vec4_generator.cpp | 1 - .../i965 => intel/compiler}/brw_vec4_gs_nir.cpp | 0 .../compiler}/brw_vec4_gs_visitor.cpp | 0 .../i965 => intel/compiler}/brw_vec4_gs_visitor.h | 0 .../compiler}/brw_vec4_live_variables.cpp | 0 .../compiler}/brw_vec4_live_variables.h | 0 .../dri/i965 => intel/compiler}/brw_vec4_nir.cpp | 1 - .../compiler}/brw_vec4_reg_allocate.cpp | 0 .../compiler}/brw_vec4_surface_builder.cpp | 0 .../compiler}/brw_vec4_surface_builder.h | 0 .../dri/i965 => intel/compiler}/brw_vec4_tcs.cpp | 0 .../dri/i965 => intel/compiler}/brw_vec4_tcs.h | 0 .../dri/i965 => intel/compiler}/brw_vec4_tes.cpp | 0 .../dri/i965 => intel/compiler}/brw_vec4_tes.h | 0 .../i965 => intel/compiler}/brw_vec4_visitor.cpp | 1 - .../dri/i965 => intel/compiler}/brw_vec4_vs.h | 0 .../compiler}/brw_vec4_vs_visitor.cpp | 0 .../dri/i965 => intel/compiler}/brw_vue_map.c | 0 .../dri/i965 => intel/compiler}/brw_wm_iz.cpp | 1 - .../i965 => intel/compiler}/gen6_gs_visitor.cpp | 0 .../dri/i965 => intel/compiler}/gen6_gs_visitor.h | 0 .../i965 => intel/compiler}/intel_asm_annotation.c | 0 .../i965 => intel/compiler}/intel_asm_annotation.h | 0 .../compiler/test_eu_compact.cpp} | 2 +- .../i965 => intel/compiler}/test_eu_validate.cpp | 0 .../compiler}/test_fs_cmod_propagation.cpp | 0 .../compiler}/test_fs_copy_propagation.cpp | 0 .../compiler}/test_fs_saturate_propagation.cpp | 0 .../compiler}/test_vec4_cmod_propagation.cpp | 0 .../compiler}/test_vec4_copy_propagation.cpp | 0 .../compiler}/test_vec4_register_coalesce.cpp | 0 .../compiler}/test_vf_float_conversions.cpp | 0 src/intel/isl/isl_storage_image.c | 2 +- src/intel/tools/disasm.c | 4 +- src/intel/vulkan/Makefile.am | 213 ---- src/intel/vulkan/Makefile.sources | 85 -- src/intel/vulkan/anv_pipeline.c | 2 +- src/intel/vulkan/anv_private.h | 4 +- src/intel/vulkan/anv_wsi_wayland.c | 3 - src/mesa/drivers/dri/i965/Android.mk | 30 +- src/mesa/drivers/dri/i965/Makefile.am | 94 +- src/mesa/drivers/dri/i965/Makefile.sources | 94 +- src/mesa/drivers/dri/i965/brw_clip.h | 2 +- src/mesa/drivers/dri/i965/brw_context.h | 2 +- src/mesa/drivers/dri/i965/brw_cs.c | 2 +- src/mesa/drivers/dri/i965/brw_defines.h | 1212 +------------------ src/mesa/drivers/dri/i965/brw_draw.c | 1 + src/mesa/drivers/dri/i965/brw_ff_gs.h | 2 +- src/mesa/drivers/dri/i965/brw_gs.c | 2 +- src/mesa/drivers/dri/i965/brw_link.cpp | 2 +- src/mesa/drivers/dri/i965/brw_misc_state.c | 1 + src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 3 +- src/mesa/drivers/dri/i965/brw_program.c | 3 +- src/mesa/drivers/dri/i965/brw_program.h | 8 +- src/mesa/drivers/dri/i965/brw_program_cache.c | 2 +- src/mesa/drivers/dri/i965/brw_sf.h | 2 +- src/mesa/drivers/dri/i965/brw_state_upload.c | 1 + src/mesa/drivers/dri/i965/brw_tcs.c | 2 +- src/mesa/drivers/dri/i965/brw_tes.c | 2 +- src/mesa/drivers/dri/i965/brw_util.c | 1 + src/mesa/drivers/dri/i965/brw_vs.c | 2 +- src/mesa/drivers/dri/i965/brw_wm.c | 2 +- src/mesa/drivers/dri/i965/gen6_clip_state.c | 1 + src/mesa/drivers/dri/i965/gen6_wm_state.c | 1 + src/mesa/drivers/dri/i965/gen7_wm_state.c | 1 + src/mesa/drivers/dri/i965/gen8_depth_state.c | 1 + src/util/bitscan.c | 4 +- src/util/bitscan.h | 8 +- src/vulkan/Makefile.am | 20 +- src/vulkan/Makefile.sources | 4 + src/vulkan/wsi/.gitignore | 2 + src/vulkan/wsi/wsi_common_wayland.c | 2 +- 154 files changed, 1904 insertions(+), 1879 deletions(-) rename src/egl/wayland/{ => wayland-drm}/.gitignore (100%) rename src/{mesa/drivers/dri/i965/Android.gen.mk => intel/Android.compiler.mk} (58%) rename src/intel/{vulkan/Android.mk => Android.vulkan.mk} (89%) create mode 100644 src/intel/Makefile.compiler.am rename src/intel/{tools/Makefile.am => Makefile.tools.am} (56%) create mode 100644 src/intel/Makefile.vulkan.am rename src/{mesa/drivers/dri/i965 => intel/compiler}/.gitignore (82%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_cfg.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_cfg.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_compiler.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_compiler.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_dead_control_flow.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_dead_control_flow.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_disasm.c (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.c (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.h (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_compact.c (100%) create mode 100644 src/intel/compiler/brw_eu_defines.h rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_emit.c (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_util.c (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_validate.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs.cpp (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_builder.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_cmod_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_combine_constants.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_copy_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_cse.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_dead_code_eliminate.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_generator.cpp (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_live_variables.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_live_variables.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_lower_d2x.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_lower_pack.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_nir.cpp (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_reg_allocate.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_register_coalesce.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_saturate_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_sel_peephole.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_surface_builder.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_surface_builder.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_validate.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs_visitor.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_inst.h (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_interpolation_map.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_allocator.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_fs.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_ir_vec4.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_analyze_boolean_resolves.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_attribute_workarounds.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_intrinsics.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_opt_peephole_ffma.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_tcs_workarounds.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_nir_trig_workarounds.py (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_packed_float.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_predicated_break.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_reg.h (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_schedule_instructions.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_shader.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_shader.h (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.h (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_builder.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_cmod_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_copy_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_cse.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_dead_code_eliminate.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_generator.cpp (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_nir.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_visitor.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_gs_visitor.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_live_variables.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_live_variables.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_nir.cpp (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_reg_allocate.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_surface_builder.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_surface_builder.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tcs.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tcs.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tes.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_tes.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_visitor.cpp (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_vs.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4_vs_visitor.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vue_map.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_wm_iz.cpp (99%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/gen6_gs_visitor.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/gen6_gs_visitor.h (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/intel_asm_annotation.c (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/intel_asm_annotation.h (100%) rename src/{mesa/drivers/dri/i965/test_eu_compact.c => intel/compiler/test_eu_compact.cpp} (98%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_eu_validate.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_fs_cmod_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_fs_copy_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_fs_saturate_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vec4_cmod_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vec4_copy_propagation.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vec4_register_coalesce.cpp (100%) rename src/{mesa/drivers/dri/i965 => intel/compiler}/test_vf_float_conversions.cpp (100%) delete mode 100644 src/intel/vulkan/Makefile.am delete mode 100644 src/intel/vulkan/Makefile.sources create mode 100644 src/vulkan/wsi/.gitignore -- 2.11.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
