[Mesa-dev] [PATCH 12/17] i965: Move the back-end compiler to src/intel/compiler
Jason Ekstrand
jason at jlekstrand.net
Wed Mar 8 17:37:24 UTC 2017
On Wed, Mar 8, 2017 at 9:16 AM, Emil Velikov <emil.l.velikov at gmail.com>
wrote:
> From: Jason Ekstrand <jason.ekstrand at intel.com>
>
> Mostly a dummy git mv with a couple of noticable parts:
> - With the earlier header cleanups, nothing in src/intel depends on
> files in src/mesa/drivers/dri/i965/ - drop the -I...i965
> - Both Autoconf and Android builds are addressed. Thanks to Mauro and
> Tapani for the help with the latter
> - brw_util.[ch] is not really compiler specific, so it's moved to i965.
> - update all src/intel/ targets to use the correct includes.
>
> [Emil Velikov: commit message, various small fixes througout]
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> src/intel/Android.blorp.mk | 2 +-
> .../Android.gen.mk => intel/Android.compiler.mk} | 41 ++++++--
> src/intel/Android.isl.mk | 6 +-
> src/intel/Android.mk | 1 +
> src/intel/Makefile.am | 7 +-
> src/intel/Makefile.compiler.am | 116
> +++++++++++++++++++++
> src/intel/Makefile.sources | 89 ++++++++++++++++
> src/intel/blorp/blorp_priv.h | 2 +-
> src/intel/compiler/.gitignore | 10 ++
> .../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_defines.h | 0
>
ugh... I don't really want to put brw_defines.h in the compiler... Half
of brw_defines.h is really i965 GL stuff and half of it is compiler stuff.
I think what we really want to do is split brw_defines.h into brw_defines.h
and brw_eu_defines.h and hope there isn't much overlap.
Ken, what do you think?
> .../dri/i965 => intel/compiler}/brw_disasm.c | 0
> .../drivers/dri/i965 => intel/compiler}/brw_eu.c | 0
> .../drivers/dri/i965 => intel/compiler}/brw_eu.h | 0
> .../dri/i965 => intel/compiler}/brw_eu_compact.c | 0
> .../dri/i965 => intel/compiler}/brw_eu_emit.c | 0
> .../dri/i965 => intel/compiler}/brw_eu_util.c | 0
> .../dri/i965 => intel/compiler}/brw_eu_validate.c | 0
> .../drivers/dri/i965 => intel/compiler}/brw_fs.cpp | 0
> .../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 | 0
> .../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 | 0
> .../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 | 0
> .../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 | 0
> .../compiler}/brw_schedule_instructions.cpp | 0
> .../dri/i965 => intel/compiler}/brw_shader.cpp | 0
> .../dri/i965 => intel/compiler}/brw_shader.h | 0
> .../dri/i965 => intel/compiler}/brw_vec4.cpp | 0
> .../drivers/dri/i965 => intel/compiler}/brw_vec4.h | 0
> .../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 | 0
> .../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 | 0
> .../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 | 0
> .../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 | 0
> .../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
> .../dri/i965 => intel/compiler}/test_eu_compact.c | 0
> .../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/tools/Makefile.am | 4 +-
> src/intel/tools/disasm.c | 4 +-
> src/intel/vulkan/Android.mk | 2 +-
> src/intel/vulkan/Makefile.am | 2 +-
> src/intel/vulkan/anv_pipeline.c | 2 +-
> src/intel/vulkan/anv_private.h | 2 +-
> src/mesa/drivers/dri/i965/.gitignore | 8 --
> src/mesa/drivers/dri/i965/Android.mk | 30 +-----
> src/mesa/drivers/dri/i965/Makefile.am | 94
> +----------------
> src/mesa/drivers/dri/i965/Makefile.sources | 93
> +----------------
> src/mesa/drivers/dri/i965/brw_binding_tables.c | 2 +-
> src/mesa/drivers/dri/i965/brw_blorp.c | 2 +-
> src/mesa/drivers/dri/i965/brw_cc.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clear.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clip.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clip.h | 2 +-
> src/mesa/drivers/dri/i965/brw_clip_line.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clip_point.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clip_state.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clip_tri.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clip_unfilled.c | 2 +-
> src/mesa/drivers/dri/i965/brw_clip_util.c | 2 +-
> src/mesa/drivers/dri/i965/brw_compute.c | 2 +-
> src/mesa/drivers/dri/i965/brw_conditional_render.c | 2 +-
> src/mesa/drivers/dri/i965/brw_context.c | 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_curbe.c | 2 +-
> src/mesa/drivers/dri/i965/brw_draw.c | 2 +-
> src/mesa/drivers/dri/i965/brw_draw_upload.c | 2 +-
> src/mesa/drivers/dri/i965/brw_ff_gs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_ff_gs.h | 2 +-
> src/mesa/drivers/dri/i965/brw_ff_gs_emit.c | 2 +-
> src/mesa/drivers/dri/i965/brw_gs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_gs_state.c | 2 +-
> src/mesa/drivers/dri/i965/brw_link.cpp | 2 +-
> src/mesa/drivers/dri/i965/brw_meta_util.c | 2 +-
> src/mesa/drivers/dri/i965/brw_misc_state.c | 2 +-
> src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 3 +-
> src/mesa/drivers/dri/i965/brw_performance_query.c | 2 +-
> src/mesa/drivers/dri/i965/brw_pipe_control.c | 2 +-
> src/mesa/drivers/dri/i965/brw_primitive_restart.c | 2 +-
> src/mesa/drivers/dri/i965/brw_program.c | 2 +-
> src/mesa/drivers/dri/i965/brw_program.h | 2 +-
> src/mesa/drivers/dri/i965/brw_program_cache.c | 2 +-
> src/mesa/drivers/dri/i965/brw_queryobj.c | 2 +-
> src/mesa/drivers/dri/i965/brw_sampler_state.c | 2 +-
> src/mesa/drivers/dri/i965/brw_sf.c | 2 +-
> src/mesa/drivers/dri/i965/brw_sf.h | 2 +-
> src/mesa/drivers/dri/i965/brw_sf_emit.c | 2 +-
> src/mesa/drivers/dri/i965/brw_sf_state.c | 2 +-
> src/mesa/drivers/dri/i965/brw_state_dump.c | 2 +-
> src/mesa/drivers/dri/i965/brw_surface_formats.c | 2 +-
> src/mesa/drivers/dri/i965/brw_tcs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_tes.c | 2 +-
> src/mesa/drivers/dri/i965/brw_urb.c | 2 +-
> src/mesa/drivers/dri/i965/brw_util.c | 2 +-
> src/mesa/drivers/dri/i965/brw_vs.c | 2 +-
> src/mesa/drivers/dri/i965/brw_vs_state.c | 2 +-
> src/mesa/drivers/dri/i965/brw_wm.c | 2 +-
> src/mesa/drivers/dri/i965/brw_wm_state.c | 2 +-
> src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_cc.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_clip_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_constant_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_depth_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_depthstencil.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_gs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_multisample_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_queryobj.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_sampler_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_scissor_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_sf_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_sol.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_urb.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_viewport_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_vs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen6_wm_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_cs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_ds_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_gs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_hs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_l3_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_misc_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_sf_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_sol_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_te_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_urb.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_viewport_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_vs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_wm_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_blend_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_depth_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_draw_upload.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_ds_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_gs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_hs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_multisample_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_ps_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_sf_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_sol_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_surface_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_viewport_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_vs_state.c | 2 +-
> src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c | 2 +-
> src/mesa/drivers/dri/i965/hsw_queryobj.c | 2 +-
> src/mesa/drivers/dri/i965/hsw_sol.c | 2 +-
> src/mesa/drivers/dri/i965/intel_batchbuffer.c | 2 +-
> src/mesa/drivers/dri/i965/intel_blit.c | 2 +-
> src/mesa/drivers/dri/i965/intel_extensions.c | 2 +-
> src/mesa/drivers/dri/i965/intel_fbo.c | 2 +-
> src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
> src/mesa/drivers/dri/i965/intel_state.c | 2 +-
> src/mesa/drivers/dri/i965/intel_tex.c | 2 +-
> 218 files changed, 379 insertions(+), 347 deletions(-)
> rename src/{mesa/drivers/dri/i965/Android.gen.mk => intel/
> Android.compiler.mk} (58%)
> create mode 100644 src/intel/Makefile.compiler.am
> create mode 100644 src/intel/compiler/.gitignore
> 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_defines.h (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_disasm.c (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.c (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu.h (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_compact.c
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_emit.c (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_util.c (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_eu_validate.c
> (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_fs.cpp (100%)
> 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
> (100%)
> 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 (100%)
> 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 (100%)
> 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 (100%)
> 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 (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.cpp (100%)
> rename src/{mesa/drivers/dri/i965 => intel/compiler}/brw_vec4.h (100%)
> 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
> (100%)
> 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
> (100%)
> 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
> (100%)
> 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 (100%)
> 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 => intel/compiler}/test_eu_compact.c
> (100%)
> 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%)
>
> diff --git a/src/intel/Android.blorp.mk b/src/intel/Android.blorp.mk
> index 7e7c8ae9f3..7e9805dca5 100644
> --- a/src/intel/Android.blorp.mk
> +++ b/src/intel/Android.blorp.mk
> @@ -37,7 +37,7 @@ LOCAL_C_INCLUDES := \
> $(MESA_TOP)/src/gallium/include \
> $(MESA_TOP)/src/mapi \
> $(MESA_TOP)/src/mesa \
> - $(MESA_TOP)/src/mesa/drivers/dri/i965
> + $(MESA_TOP)/src/intel/compiler
>
> LOCAL_STATIC_LIBRARIES := libmesa_nir
>
> diff --git a/src/mesa/drivers/dri/i965/Android.gen.mk b/src/intel/
> Android.compiler.mk
> similarity index 58%
> rename from src/mesa/drivers/dri/i965/Android.gen.mk
> rename to src/intel/Android.compiler.mk
> index c2b8dae339..8bbfb1cbd4 100644
> --- a/src/mesa/drivers/dri/i965/Android.gen.mk
> +++ b/src/intel/Android.compiler.mk
> @@ -1,4 +1,7 @@
> #
> +# Copyright (C) 2011 Intel Corporation
> +# Copyright (C) 2010-2011 Chia-I Wu <olvaffe at gmail.com>
> +# Copyright (C) 2010-2011 LunarG
> # Copyright (C) 2016 Linaro, Ltd., Rob Herring <robh at kernel.org>
> #
> # Permission is hereby granted, free of charge, to any person obtaining a
> @@ -20,21 +23,47 @@
> # DEALINGS IN THE SOFTWARE.
> #
>
> -ifeq ($(LOCAL_MODULE_CLASS),)
> -LOCAL_MODULE_CLASS := SHARED_LIBRARIES
> -endif
> +# ---------------------------------------
> +# Build libmesa_intel_compiler
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_intel_compiler
> +LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> +
> +LOCAL_SRC_FILES := \
> + $(COMPILER_FILES)
> +
> +LOCAL_C_INCLUDES := \
> + $(MESA_TOP)/src/intel \
> + $(MESA_TOP)/src/mapi \
> + $(MESA_TOP)/src/mesa \
> + $(MESA_TOP)/src/gallium/auxiliary \
> + $(MESA_TOP)/src/gallium/include \
> + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,)/glsl
> \
> + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir
> \
> + $(MESA_TOP)/src/compiler/nir
> +
> +LOCAL_SHARED_LIBRARIES := \
> + libdrm_intel
>
> brw_nir_trig_workarounds_deps := \
> - $(LOCAL_PATH)/brw_nir_trig_workarounds.py \
> + $(LOCAL_PATH)/compiler/brw_nir_trig_workarounds.py \
> $(MESA_TOP)/src/compiler/nir/nir_algebraic.py
>
> intermediates := $(call local-generated-sources-dir)
>
> -$(intermediates)/brw_nir_trig_workarounds.c: $(brw_nir_trig_workarounds_
> deps)
> +$(intermediates)/compiler/brw_nir_trig_workarounds.c:
> $(brw_nir_trig_workarounds_deps)
> @mkdir -p $(dir $@)
> $(hide) PYTHONPATH=$(MESA_TOP)/src/compiler/nir $(MESA_PYTHON2)
> $< > $@
>
> LOCAL_STATIC_LIBRARIES = libmesa_genxml
>
> LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
> - $(i965_compiler_GENERATED_FILES))
> + $(COMPILER_GENERATED_FILES))
> +
> +LOCAL_GENERATED_SOURCES += $(MESA_GEN_GLSL_H)
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
> index 7e578af170..499ca3ccd3 100644
> --- a/src/intel/Android.isl.mk
> +++ b/src/intel/Android.isl.mk
> @@ -25,8 +25,7 @@
> # ---------------------------------------
>
> LIBISL_GENX_COMMON_INCLUDES := \
> - $(MESA_TOP)/src/ \
> - $(MESA_TOP)/src/mesa/drivers/dri/i965
> + $(MESA_TOP)/src/
>
> # ---------------------------------------
> # Build libmesa_isl_gen4
> @@ -176,7 +175,8 @@ LOCAL_C_INCLUDES := \
> $(MESA_TOP)/src/gallium/auxiliary \
> $(MESA_TOP)/src/mapi \
> $(MESA_TOP)/src/mesa \
> - $(MESA_TOP)/src/mesa/drivers/dri/i965 \
> + $(MESA_TOP)/src/intel/compiler \
> + $(MESA_TOP)/src/mesa/drivers/dri/i965
>
> LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel
>
> diff --git a/src/intel/Android.mk b/src/intel/Android.mk
> index 147f5a7273..be2ba2fd9e 100644
> --- a/src/intel/Android.mk
> +++ b/src/intel/Android.mk
> @@ -27,6 +27,7 @@ include $(LOCAL_PATH)/Makefile.sources
>
> include $(LOCAL_PATH)/Android.blorp.mk
> include $(LOCAL_PATH)/Android.common.mk
> +include $(LOCAL_PATH)/Android.compiler.mk
> include $(LOCAL_PATH)/Android.genxml.mk
> include $(LOCAL_PATH)/Android.isl.mk
> include $(LOCAL_PATH)/vulkan/Android.mk
> diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
> index 9186b5cf1b..b7ce65543c 100644
> --- a/src/intel/Makefile.am
> +++ b/src/intel/Makefile.am
> @@ -26,12 +26,16 @@ AM_CPPFLAGS = \
> -I$(top_srcdir)/include \
> -I$(top_builddir)/src \
> -I$(top_srcdir)/src \
> + -I$(top_builddir)/src/compiler/glsl \
> + -I$(top_srcdir)/src/compiler/glsl \
> -I$(top_builddir)/src/compiler/nir \
> + -I$(top_srcdir)/src/compiler/nir \
> + -I$(top_srcdir)/src/gtest/include \
> -I$(top_builddir)/src/intel \
> -I$(top_srcdir)/src/intel \
> + -I$(top_srcdir)/src/intel/compiler \
> -I$(top_srcdir)/src/mapi \
> -I$(top_srcdir)/src/mesa \
> - -I$(top_srcdir)/src/mesa/drivers/dri/i965 \
> -I$(top_srcdir)/src/gallium/auxiliary \
> -I$(top_srcdir)/src/gallium/include \
> $(INTEL_CFLAGS) \
> @@ -54,6 +58,7 @@ EXTRA_DIST =
>
> include Makefile.blorp.am
> include Makefile.common.am
> +include Makefile.compiler.am
> include Makefile.genxml.am
> include Makefile.isl.am
>
> diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.
> am
> new file mode 100644
> index 0000000000..c5e5b11ffc
> --- /dev/null
> +++ b/src/intel/Makefile.compiler.am
> @@ -0,0 +1,116 @@
> +# Copyright 2015-2016 Intel Corporation
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the
> "Software"),
> +# to deal in the Software without restriction, including without
> limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the
> next
> +# paragraph) shall be included in all copies or substantial portions of
> the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
> OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> +# IN THE SOFTWARE.
> +
> +noinst_LTLIBRARIES += compiler/libintel_compiler.la
> +
> +compiler_libintel_compiler_la_SOURCES = \
> + $(COMPILER_FILES) \
> + $(COMPILER_GENERATED_FILES)
> +
> +BUILT_SOURCES += $(COMPILER_GENERATED_FILES)
> +
> +compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py
> \
> + $(top_srcdir)/src/compiler/
> nir/nir_algebraic.py
> + $(MKDIR_GEN)
> + $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2)
> $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py > $@ ||
> ($(RM) $@; false)
> +
> +EXTRA_DIST += \
> + compiler/brw_nir_trig_workarounds.py
> +
> +# ------------------------------------------------------------
> ----------------
> +# Tests
> +# ------------------------------------------------------------
> ----------------
> +
> +TEST_LIBS = \
> + compiler/libintel_compiler.la \
> + common/libintel_common.la \
> + $(top_builddir)/src/compiler/nir/libnir.la \
> + $(top_builddir)/src/util/libmesautil.la \
> + $(top_builddir)/src/intel/isl/libisl.la \
> + $(PTHREAD_LIBS) \
> + $(DLOPEN_LIBS)
> +
> +COMPILER_TESTS = \
> + compiler/test_fs_cmod_propagation \
> + compiler/test_fs_copy_propagation \
> + compiler/test_fs_saturate_propagation \
> + compiler/test_eu_compact \
> + compiler/test_eu_validate \
> + compiler/test_vf_float_conversions \
> + compiler/test_vec4_cmod_propagation \
> + compiler/test_vec4_copy_propagation \
> + compiler/test_vec4_register_coalesce
> +
> +TESTS += $(COMPILER_TESTS)
> +check_PROGRAMS += $(COMPILER_TESTS)
> +
> +compiler_test_fs_cmod_propagation_SOURCES = \
> + compiler/test_fs_cmod_propagation.cpp
> +compiler_test_fs_cmod_propagation_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> +
> +compiler_test_fs_copy_propagation_SOURCES = \
> + compiler/test_fs_copy_propagation.cpp
> +compiler_test_fs_copy_propagation_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> +
> +compiler_test_fs_saturate_propagation_SOURCES = \
> + compiler/test_fs_saturate_propagation.cpp
> +compiler_test_fs_saturate_propagation_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> +
> +compiler_test_vf_float_conversions_SOURCES = \
> + compiler/test_vf_float_conversions.cpp
> +compiler_test_vf_float_conversions_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> +
> +compiler_test_vec4_register_coalesce_SOURCES = \
> + compiler/test_vec4_register_coalesce.cpp
> +compiler_test_vec4_register_coalesce_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> +
> +compiler_test_vec4_copy_propagation_SOURCES = \
> + compiler/test_vec4_copy_propagation.cpp
> +compiler_test_vec4_copy_propagation_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> +
> +compiler_test_vec4_cmod_propagation_SOURCES = \
> + compiler/test_vec4_cmod_propagation.cpp
> +compiler_test_vec4_cmod_propagation_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> +
> +compiler_test_eu_compact_SOURCES = \
> + compiler/test_eu_compact.c
> +nodist_EXTRA_compiler_test_eu_compact_SOURCES = dummy.cpp
> +compiler_test_eu_compact_LDADD = $(TEST_LIBS)
> +
> +compiler_test_eu_validate_SOURCES = \
> + compiler/test_eu_validate.cpp
> +compiler_test_eu_validate_LDADD = \
> + $(top_builddir)/src/gtest/libgtest.la \
> + $(TEST_LIBS)
> diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
> index 240371261e..2ab36838b0 100644
> --- a/src/intel/Makefile.sources
> +++ b/src/intel/Makefile.sources
> @@ -16,6 +16,95 @@ COMMON_FILES = \
> common/gen_urb_config.c \
> common/gen_sample_positions.h
>
> +COMPILER_FILES = \
> + compiler/brw_cfg.cpp \
> + compiler/brw_cfg.h \
> + compiler/brw_compiler.c \
> + compiler/brw_compiler.h \
> + compiler/brw_dead_control_flow.cpp \
> + compiler/brw_dead_control_flow.h \
> + compiler/brw_defines.h \
> + compiler/brw_disasm.c \
> + compiler/brw_eu.c \
> + compiler/brw_eu_compact.c \
> + compiler/brw_eu_emit.c \
> + compiler/brw_eu.h \
> + compiler/brw_eu_util.c \
> + compiler/brw_eu_validate.c \
> + compiler/brw_fs_builder.h \
> + compiler/brw_fs_cmod_propagation.cpp \
> + compiler/brw_fs_combine_constants.cpp \
> + compiler/brw_fs_copy_propagation.cpp \
> + compiler/brw_fs.cpp \
> + compiler/brw_fs_cse.cpp \
> + compiler/brw_fs_dead_code_eliminate.cpp \
> + compiler/brw_fs_generator.cpp \
> + compiler/brw_fs.h \
> + compiler/brw_fs_live_variables.cpp \
> + compiler/brw_fs_live_variables.h \
> + compiler/brw_fs_lower_d2x.cpp \
> + compiler/brw_fs_lower_pack.cpp \
> + compiler/brw_fs_nir.cpp \
> + compiler/brw_fs_reg_allocate.cpp \
> + compiler/brw_fs_register_coalesce.cpp \
> + compiler/brw_fs_saturate_propagation.cpp \
> + compiler/brw_fs_sel_peephole.cpp \
> + compiler/brw_fs_surface_builder.cpp \
> + compiler/brw_fs_surface_builder.h \
> + compiler/brw_fs_validate.cpp \
> + compiler/brw_fs_visitor.cpp \
> + compiler/brw_inst.h \
> + compiler/brw_interpolation_map.c \
> + compiler/brw_ir_allocator.h \
> + compiler/brw_ir_fs.h \
> + compiler/brw_ir_vec4.h \
> + compiler/brw_nir.h \
> + compiler/brw_nir.c \
> + compiler/brw_nir_analyze_boolean_resolves.c \
> + compiler/brw_nir_attribute_workarounds.c \
> + compiler/brw_nir_intrinsics.c \
> + compiler/brw_nir_opt_peephole_ffma.c \
> + compiler/brw_nir_tcs_workarounds.c \
> + compiler/brw_packed_float.c \
> + compiler/brw_predicated_break.cpp \
> + compiler/brw_reg.h \
> + compiler/brw_schedule_instructions.cpp \
> + compiler/brw_shader.cpp \
> + compiler/brw_shader.h \
> + compiler/brw_vec4_builder.h \
> + compiler/brw_vec4_cmod_propagation.cpp \
> + compiler/brw_vec4_copy_propagation.cpp \
> + compiler/brw_vec4.cpp \
> + compiler/brw_vec4_cse.cpp \
> + compiler/brw_vec4_dead_code_eliminate.cpp \
> + compiler/brw_vec4_generator.cpp \
> + compiler/brw_vec4_gs_visitor.cpp \
> + compiler/brw_vec4_gs_visitor.h \
> + compiler/brw_vec4.h \
> + compiler/brw_vec4_live_variables.cpp \
> + compiler/brw_vec4_live_variables.h \
> + compiler/brw_vec4_nir.cpp \
> + compiler/brw_vec4_gs_nir.cpp \
> + compiler/brw_vec4_reg_allocate.cpp \
> + compiler/brw_vec4_surface_builder.cpp \
> + compiler/brw_vec4_surface_builder.h \
> + compiler/brw_vec4_tcs.cpp \
> + compiler/brw_vec4_tcs.h \
> + compiler/brw_vec4_tes.cpp \
> + compiler/brw_vec4_tes.h \
> + compiler/brw_vec4_visitor.cpp \
> + compiler/brw_vec4_vs_visitor.cpp \
> + compiler/brw_vec4_vs.h \
> + compiler/brw_vue_map.c \
> + compiler/brw_wm_iz.cpp \
> + compiler/gen6_gs_visitor.cpp \
> + compiler/gen6_gs_visitor.h \
> + compiler/intel_asm_annotation.c \
> + compiler/intel_asm_annotation.h
> +
> +COMPILER_GENERATED_FILES = \
> + compiler/brw_nir_trig_workarounds.c
> +
> GENXML_GENERATED_FILES = \
> genxml/gen4_pack.h \
> genxml/gen45_pack.h \
> diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h
> index d9c03b1c07..c61ab08746 100644
> --- a/src/intel/blorp/blorp_priv.h
> +++ b/src/intel/blorp/blorp_priv.h
> @@ -27,7 +27,7 @@
> #include <stdint.h>
>
> #include "compiler/nir/nir.h"
> -#include "brw_compiler.h"
> +#include "compiler/brw_compiler.h"
>
> #include "blorp.h"
>
> diff --git a/src/intel/compiler/.gitignore b/src/intel/compiler/.gitignore
> new file mode 100644
> index 0000000000..e844421b33
> --- /dev/null
> +++ b/src/intel/compiler/.gitignore
> @@ -0,0 +1,10 @@
> +brw_nir_trig_workarounds.c
> +test_eu_compact
> +test_eu_validate
> +test_fs_cmod_propagation
> +test_fs_copy_propagation
> +test_fs_saturate_propagation
> +test_vec4_cmod_propagation
> +test_vec4_copy_propagation
> +test_vec4_register_coalesce
> +test_vf_float_conversions
> diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp
> b/src/intel/compiler/brw_cfg.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_cfg.cpp
> rename to src/intel/compiler/brw_cfg.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_cfg.h
> b/src/intel/compiler/brw_cfg.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_cfg.h
> rename to src/intel/compiler/brw_cfg.h
> diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c
> b/src/intel/compiler/brw_compiler.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_compiler.c
> rename to src/intel/compiler/brw_compiler.c
> diff --git a/src/mesa/drivers/dri/i965/brw_compiler.h
> b/src/intel/compiler/brw_compiler.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_compiler.h
> rename to src/intel/compiler/brw_compiler.h
> diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
> b/src/intel/compiler/brw_dead_control_flow.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
> rename to src/intel/compiler/brw_dead_control_flow.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.h
> b/src/intel/compiler/brw_dead_control_flow.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_dead_control_flow.h
> rename to src/intel/compiler/brw_dead_control_flow.h
> diff --git a/src/mesa/drivers/dri/i965/brw_defines.h
> b/src/intel/compiler/brw_defines.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_defines.h
> rename to src/intel/compiler/brw_defines.h
> diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c
> b/src/intel/compiler/brw_disasm.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_disasm.c
> rename to src/intel/compiler/brw_disasm.c
> diff --git a/src/mesa/drivers/dri/i965/brw_eu.c
> b/src/intel/compiler/brw_eu.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_eu.c
> rename to src/intel/compiler/brw_eu.c
> diff --git a/src/mesa/drivers/dri/i965/brw_eu.h
> b/src/intel/compiler/brw_eu.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_eu.h
> rename to src/intel/compiler/brw_eu.h
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c
> b/src/intel/compiler/brw_eu_compact.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_eu_compact.c
> rename to src/intel/compiler/brw_eu_compact.c
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c
> b/src/intel/compiler/brw_eu_emit.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_eu_emit.c
> rename to src/intel/compiler/brw_eu_emit.c
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_util.c
> b/src/intel/compiler/brw_eu_util.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_eu_util.c
> rename to src/intel/compiler/brw_eu_util.c
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_validate.c
> b/src/intel/compiler/brw_eu_validate.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_eu_validate.c
> rename to src/intel/compiler/brw_eu_validate.c
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp
> b/src/intel/compiler/brw_fs.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs.cpp
> rename to src/intel/compiler/brw_fs.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs.h
> b/src/intel/compiler/brw_fs.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs.h
> rename to src/intel/compiler/brw_fs.h
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_builder.h
> b/src/intel/compiler/brw_fs_builder.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_builder.h
> rename to src/intel/compiler/brw_fs_builder.h
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
> b/src/intel/compiler/brw_fs_cmod_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
> rename to src/intel/compiler/brw_fs_cmod_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp
> b/src/intel/compiler/brw_fs_combine_constants.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_combine_constants.cpp
> rename to src/intel/compiler/brw_fs_combine_constants.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> b/src/intel/compiler/brw_fs_copy_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
> rename to src/intel/compiler/brw_fs_copy_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
> b/src/intel/compiler/brw_fs_cse.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_cse.cpp
> rename to src/intel/compiler/brw_fs_cse.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
> b/src/intel/compiler/brw_fs_dead_code_eliminate.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_dead_code_eliminate.cpp
> rename to src/intel/compiler/brw_fs_dead_code_eliminate.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
> b/src/intel/compiler/brw_fs_generator.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_generator.cpp
> rename to src/intel/compiler/brw_fs_generator.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
> b/src/intel/compiler/brw_fs_live_variables.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
> rename to src/intel/compiler/brw_fs_live_variables.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.h
> b/src/intel/compiler/brw_fs_live_variables.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_live_variables.h
> rename to src/intel/compiler/brw_fs_live_variables.h
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp
> b/src/intel/compiler/brw_fs_lower_d2x.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp
> rename to src/intel/compiler/brw_fs_lower_d2x.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp
> b/src/intel/compiler/brw_fs_lower_pack.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_lower_pack.cpp
> rename to src/intel/compiler/brw_fs_lower_pack.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> b/src/intel/compiler/brw_fs_nir.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> rename to src/intel/compiler/brw_fs_nir.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> b/src/intel/compiler/brw_fs_reg_allocate.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> rename to src/intel/compiler/brw_fs_reg_allocate.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
> b/src/intel/compiler/brw_fs_register_coalesce.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
> rename to src/intel/compiler/brw_fs_register_coalesce.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_saturate_propagation.cpp
> b/src/intel/compiler/brw_fs_saturate_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_saturate_propagation.cpp
> rename to src/intel/compiler/brw_fs_saturate_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
> b/src/intel/compiler/brw_fs_sel_peephole.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
> rename to src/intel/compiler/brw_fs_sel_peephole.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
> b/src/intel/compiler/brw_fs_surface_builder.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp
> rename to src/intel/compiler/brw_fs_surface_builder.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.h
> b/src/intel/compiler/brw_fs_surface_builder.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_surface_builder.h
> rename to src/intel/compiler/brw_fs_surface_builder.h
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_validate.cpp
> b/src/intel/compiler/brw_fs_validate.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_validate.cpp
> rename to src/intel/compiler/brw_fs_validate.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> b/src/intel/compiler/brw_fs_visitor.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
> rename to src/intel/compiler/brw_fs_visitor.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_inst.h
> b/src/intel/compiler/brw_inst.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_inst.h
> rename to src/intel/compiler/brw_inst.h
> diff --git a/src/mesa/drivers/dri/i965/brw_interpolation_map.c
> b/src/intel/compiler/brw_interpolation_map.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_interpolation_map.c
> rename to src/intel/compiler/brw_interpolation_map.c
> diff --git a/src/mesa/drivers/dri/i965/brw_ir_allocator.h
> b/src/intel/compiler/brw_ir_allocator.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_ir_allocator.h
> rename to src/intel/compiler/brw_ir_allocator.h
> diff --git a/src/mesa/drivers/dri/i965/brw_ir_fs.h
> b/src/intel/compiler/brw_ir_fs.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_ir_fs.h
> rename to src/intel/compiler/brw_ir_fs.h
> diff --git a/src/mesa/drivers/dri/i965/brw_ir_vec4.h
> b/src/intel/compiler/brw_ir_vec4.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_ir_vec4.h
> rename to src/intel/compiler/brw_ir_vec4.h
> diff --git a/src/mesa/drivers/dri/i965/brw_nir.c
> b/src/intel/compiler/brw_nir.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir.c
> rename to src/intel/compiler/brw_nir.c
> diff --git a/src/mesa/drivers/dri/i965/brw_nir.h
> b/src/intel/compiler/brw_nir.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir.h
> rename to src/intel/compiler/brw_nir.h
> diff --git a/src/mesa/drivers/dri/i965/brw_nir_analyze_boolean_resolves.c
> b/src/intel/compiler/brw_nir_analyze_boolean_resolves.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir_analyze_boolean_resolves.c
> rename to src/intel/compiler/brw_nir_analyze_boolean_resolves.c
> diff --git a/src/mesa/drivers/dri/i965/brw_nir_attribute_workarounds.c
> b/src/intel/compiler/brw_nir_attribute_workarounds.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir_attribute_workarounds.c
> rename to src/intel/compiler/brw_nir_attribute_workarounds.c
> diff --git a/src/mesa/drivers/dri/i965/brw_nir_intrinsics.c
> b/src/intel/compiler/brw_nir_intrinsics.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir_intrinsics.c
> rename to src/intel/compiler/brw_nir_intrinsics.c
> diff --git a/src/mesa/drivers/dri/i965/brw_nir_opt_peephole_ffma.c
> b/src/intel/compiler/brw_nir_opt_peephole_ffma.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir_opt_peephole_ffma.c
> rename to src/intel/compiler/brw_nir_opt_peephole_ffma.c
> diff --git a/src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c
> b/src/intel/compiler/brw_nir_tcs_workarounds.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir_tcs_workarounds.c
> rename to src/intel/compiler/brw_nir_tcs_workarounds.c
> diff --git a/src/mesa/drivers/dri/i965/brw_nir_trig_workarounds.py
> b/src/intel/compiler/brw_nir_trig_workarounds.py
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_nir_trig_workarounds.py
> rename to src/intel/compiler/brw_nir_trig_workarounds.py
> diff --git a/src/mesa/drivers/dri/i965/brw_packed_float.c
> b/src/intel/compiler/brw_packed_float.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_packed_float.c
> rename to src/intel/compiler/brw_packed_float.c
> diff --git a/src/mesa/drivers/dri/i965/brw_predicated_break.cpp
> b/src/intel/compiler/brw_predicated_break.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_predicated_break.cpp
> rename to src/intel/compiler/brw_predicated_break.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_reg.h
> b/src/intel/compiler/brw_reg.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_reg.h
> rename to src/intel/compiler/brw_reg.h
> diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
> b/src/intel/compiler/brw_schedule_instructions.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
> rename to src/intel/compiler/brw_schedule_instructions.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp
> b/src/intel/compiler/brw_shader.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_shader.cpp
> rename to src/intel/compiler/brw_shader.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_shader.h
> b/src/intel/compiler/brw_shader.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_shader.h
> rename to src/intel/compiler/brw_shader.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp
> b/src/intel/compiler/brw_vec4.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4.cpp
> rename to src/intel/compiler/brw_vec4.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h
> b/src/intel/compiler/brw_vec4.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4.h
> rename to src/intel/compiler/brw_vec4.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_builder.h
> b/src/intel/compiler/brw_vec4_builder.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_builder.h
> rename to src/intel/compiler/brw_vec4_builder.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp
> b/src/intel/compiler/brw_vec4_cmod_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_cmod_propagation.cpp
> rename to src/intel/compiler/brw_vec4_cmod_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
> b/src/intel/compiler/brw_vec4_copy_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
> rename to src/intel/compiler/brw_vec4_copy_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
> b/src/intel/compiler/brw_vec4_cse.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
> rename to src/intel/compiler/brw_vec4_cse.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp
> b/src/intel/compiler/brw_vec4_dead_code_eliminate.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_dead_code_eliminate.cpp
> rename to src/intel/compiler/brw_vec4_dead_code_eliminate.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
> b/src/intel/compiler/brw_vec4_generator.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
> rename to src/intel/compiler/brw_vec4_generator.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_nir.cpp
> b/src/intel/compiler/brw_vec4_gs_nir.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_gs_nir.cpp
> rename to src/intel/compiler/brw_vec4_gs_nir.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
> b/src/intel/compiler/brw_vec4_gs_visitor.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp
> rename to src/intel/compiler/brw_vec4_gs_visitor.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
> b/src/intel/compiler/brw_vec4_gs_visitor.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.h
> rename to src/intel/compiler/brw_vec4_gs_visitor.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
> b/src/intel/compiler/brw_vec4_live_variables.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_live_variables.cpp
> rename to src/intel/compiler/brw_vec4_live_variables.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
> b/src/intel/compiler/brw_vec4_live_variables.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_live_variables.h
> rename to src/intel/compiler/brw_vec4_live_variables.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
> b/src/intel/compiler/brw_vec4_nir.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
> rename to src/intel/compiler/brw_vec4_nir.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
> b/src/intel/compiler/brw_vec4_reg_allocate.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp
> rename to src/intel/compiler/brw_vec4_reg_allocate.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_surface_builder.cpp
> b/src/intel/compiler/brw_vec4_surface_builder.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_surface_builder.cpp
> rename to src/intel/compiler/brw_vec4_surface_builder.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_surface_builder.h
> b/src/intel/compiler/brw_vec4_surface_builder.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_surface_builder.h
> rename to src/intel/compiler/brw_vec4_surface_builder.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
> b/src/intel/compiler/brw_vec4_tcs.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
> rename to src/intel/compiler/brw_vec4_tcs.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tcs.h
> b/src/intel/compiler/brw_vec4_tcs.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_tcs.h
> rename to src/intel/compiler/brw_vec4_tcs.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp
> b/src/intel/compiler/brw_vec4_tes.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_tes.cpp
> rename to src/intel/compiler/brw_vec4_tes.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tes.h
> b/src/intel/compiler/brw_vec4_tes.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_tes.h
> rename to src/intel/compiler/brw_vec4_tes.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> b/src/intel/compiler/brw_vec4_visitor.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
> rename to src/intel/compiler/brw_vec4_visitor.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs.h
> b/src/intel/compiler/brw_vec4_vs.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_vs.h
> rename to src/intel/compiler/brw_vec4_vs.h
> diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
> b/src/intel/compiler/brw_vec4_vs_visitor.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
> rename to src/intel/compiler/brw_vec4_vs_visitor.cpp
> diff --git a/src/mesa/drivers/dri/i965/brw_vue_map.c
> b/src/intel/compiler/brw_vue_map.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_vue_map.c
> rename to src/intel/compiler/brw_vue_map.c
> diff --git a/src/mesa/drivers/dri/i965/brw_wm_iz.cpp
> b/src/intel/compiler/brw_wm_iz.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/brw_wm_iz.cpp
> rename to src/intel/compiler/brw_wm_iz.cpp
> diff --git a/src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp
> b/src/intel/compiler/gen6_gs_visitor.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/gen6_gs_visitor.cpp
> rename to src/intel/compiler/gen6_gs_visitor.cpp
> diff --git a/src/mesa/drivers/dri/i965/gen6_gs_visitor.h
> b/src/intel/compiler/gen6_gs_visitor.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/gen6_gs_visitor.h
> rename to src/intel/compiler/gen6_gs_visitor.h
> diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c
> b/src/intel/compiler/intel_asm_annotation.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/intel_asm_annotation.c
> rename to src/intel/compiler/intel_asm_annotation.c
> diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.h
> b/src/intel/compiler/intel_asm_annotation.h
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/intel_asm_annotation.h
> rename to src/intel/compiler/intel_asm_annotation.h
> diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c
> b/src/intel/compiler/test_eu_compact.c
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_eu_compact.c
> rename to src/intel/compiler/test_eu_compact.c
> diff --git a/src/mesa/drivers/dri/i965/test_eu_validate.cpp
> b/src/intel/compiler/test_eu_validate.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_eu_validate.cpp
> rename to src/intel/compiler/test_eu_validate.cpp
> diff --git a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> b/src/intel/compiler/test_fs_cmod_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> rename to src/intel/compiler/test_fs_cmod_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/test_fs_copy_propagation.cpp
> b/src/intel/compiler/test_fs_copy_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_fs_copy_propagation.cpp
> rename to src/intel/compiler/test_fs_copy_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp
> b/src/intel/compiler/test_fs_saturate_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp
> rename to src/intel/compiler/test_fs_saturate_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp
> b/src/intel/compiler/test_vec4_cmod_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp
> rename to src/intel/compiler/test_vec4_cmod_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp
> b/src/intel/compiler/test_vec4_copy_propagation.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp
> rename to src/intel/compiler/test_vec4_copy_propagation.cpp
> diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
> b/src/intel/compiler/test_vec4_register_coalesce.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
> rename to src/intel/compiler/test_vec4_register_coalesce.cpp
> diff --git a/src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp
> b/src/intel/compiler/test_vf_float_conversions.cpp
> similarity index 100%
> rename from src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp
> rename to src/intel/compiler/test_vf_float_conversions.cpp
> diff --git a/src/intel/tools/Makefile.am b/src/intel/tools/Makefile.am
> index 5f4d78d6fd..3ef4f31ade 100644
> --- a/src/intel/tools/Makefile.am
> +++ b/src/intel/tools/Makefile.am
> @@ -29,8 +29,6 @@ AM_CPPFLAGS = \
> -I$(top_srcdir)/src \
> -I$(top_srcdir)/src/mapi \
> -I$(top_srcdir)/src/mesa \
> - -I$(top_srcdir)/src/mesa/drivers/dri/common \
> - -I$(top_srcdir)/src/mesa/drivers/dri/i965 \
> -I$(top_srcdir)/src/gallium/auxiliary \
> -I$(top_srcdir)/src/gallium/include \
> -I$(top_builddir)/src/intel \
> @@ -38,7 +36,7 @@ AM_CPPFLAGS = \
>
> aubinator_DEPS = \
> $(top_builddir)/src/intel/common/libintel_common.la \
> - $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
> + $(top_builddir)/src/intel/compiler/libintel_compiler.la \
> $(top_builddir)/src/util/libmesautil.la \
> $(PER_GEN_LIBS) \
> $(PTHREAD_LIBS) \
> diff --git a/src/intel/tools/disasm.c b/src/intel/tools/disasm.c
> index 96c6ce290a..62256d2b53 100644
> --- a/src/intel/tools/disasm.c
> +++ b/src/intel/tools/disasm.c
> @@ -23,8 +23,8 @@
>
> #include <stdlib.h>
>
> -#include "brw_inst.h"
> -#include "brw_eu.h"
> +#include "compiler/brw_inst.h"
> +#include "compiler/brw_eu.h"
>
> #include "gen_disasm.h"
>
> diff --git a/src/intel/vulkan/Android.mk b/src/intel/vulkan/Android.mk
> index a6a7d263f6..ae6b7c7a9d 100644
> --- a/src/intel/vulkan/Android.mk
> +++ b/src/intel/vulkan/Android.mk
> @@ -220,7 +220,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
> libmesa_anv_gen75 \
> libmesa_anv_gen8 \
> libmesa_anv_gen9 \
> - libmesa_i965_compiler \
> + libmesa_intel_compiler \
> libmesa_anv_entrypoints
>
> LOCAL_SHARED_LIBRARIES := \
> diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
> index 6c902b52e1..fa594c0759 100644
> --- a/src/intel/vulkan/Makefile.am
> +++ b/src/intel/vulkan/Makefile.am
> @@ -123,7 +123,7 @@ VULKAN_LIB_DEPS += \
> libvulkan_common.la \
> $(top_builddir)/src/vulkan/libvulkan_util.la \
> $(top_builddir)/src/vulkan/libvulkan_wsi.la \
> - $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
> + $(top_builddir)/src/intel/compiler/libintel_compiler.la \
> $(top_builddir)/src/compiler/nir/libnir.la \
> $(top_builddir)/src/util/libmesautil.la \
> $(top_builddir)/src/intel/common/libintel_common.la \
> diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_
> pipeline.c
> index dc65e268de..6362c2db6b 100644
> --- a/src/intel/vulkan/anv_pipeline.c
> +++ b/src/intel/vulkan/anv_pipeline.c
> @@ -30,7 +30,7 @@
> #include "util/mesa-sha1.h"
> #include "common/gen_l3_config.h"
> #include "anv_private.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "anv_nir.h"
> #include "spirv/nir_spirv.h"
>
> diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_
> private.h
> index 2552226879..3855416657 100644
> --- a/src/intel/vulkan/anv_private.h
> +++ b/src/intel/vulkan/anv_private.h
> @@ -43,7 +43,7 @@
>
> #include "common/gen_device_info.h"
> #include "blorp/blorp.h"
> -#include "brw_compiler.h"
> +#include "compiler/brw_compiler.h"
> #include "util/macros.h"
> #include "util/list.h"
> #include "util/u_vector.h"
> diff --git a/src/mesa/drivers/dri/i965/.gitignore
> b/src/mesa/drivers/dri/i965/.gitignore
> index a6ecc924fa..b806e740c2 100644
> --- a/src/mesa/drivers/dri/i965/.gitignore
> +++ b/src/mesa/drivers/dri/i965/.gitignore
> @@ -1,9 +1 @@
> -brw_nir_trig_workarounds.c
> i965_symbols_test
> -test_eu_compact
> -test_vec4_copy_propagation
> -test_vec4_register_coalesce
> -test_vf_float_conversions
> -test_fs_cmod_propagation
> -test_fs_saturate_propagation
> -test_vec4_cmod_propagation
> diff --git a/src/mesa/drivers/dri/i965/Android.mk
> b/src/mesa/drivers/dri/i965/Android.mk
> index 7dea3c2507..708851c866 100644
> --- a/src/mesa/drivers/dri/i965/Android.mk
> +++ b/src/mesa/drivers/dri/i965/Android.mk
> @@ -152,32 +152,6 @@ include $(MESA_COMMON_MK)
> include $(BUILD_STATIC_LIBRARY)
>
> # ---------------------------------------
> -# Build libmesa_i965_compiler
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_i965_compiler
> -LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> -
> -LOCAL_SRC_FILES := \
> - $(i965_compiler_FILES)
> -
> -LOCAL_C_INCLUDES := \
> - $(MESA_DRI_C_INCLUDES) \
> - $(MESA_TOP)/src/intel \
> - $(MESA_TOP)/src/compiler/nir \
> - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir
> \
> - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,
> ,)/glsl
> -
> -LOCAL_SHARED_LIBRARIES := \
> - libdrm_intel
> -
> -include $(LOCAL_PATH)/Android.gen.mk
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> # Build i965_dri
> # ---------------------------------------
>
> @@ -209,9 +183,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
> $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \
> $(I965_PERGEN_LIBS) \
> libmesa_intel_common \
> - libmesa_blorp \
> libmesa_isl \
> - libmesa_i965_compiler
> + libmesa_blorp \
> + libmesa_intel_compiler
>
> LOCAL_SHARED_LIBRARIES := \
> $(MESA_DRI_SHARED_LIBRARIES) \
> diff --git a/src/mesa/drivers/dri/i965/Makefile.am
> b/src/mesa/drivers/dri/i965/Makefile.am
> index 4ff7e70b51..a2a054b6df 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.am
> +++ b/src/mesa/drivers/dri/i965/Makefile.am
> @@ -44,11 +44,6 @@ AM_CFLAGS = \
>
> AM_CXXFLAGS = $(AM_CFLAGS)
>
> -MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
> -brw_nir_trig_workarounds.c: brw_nir_trig_workarounds.py
> $(top_srcdir)/src/compiler/nir/nir_algebraic.py
> - $(MKDIR_GEN)
> - $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2)
> $(PYTHON_FLAGS) $(srcdir)/brw_nir_trig_workarounds.py > $@ || ($(RM) $@;
> false)
> -
> I965_PERGEN_LIBS = \
> libi965_gen6.la \
> libi965_gen7.la \
> @@ -73,100 +68,13 @@ libi965_gen9_la_CFLAGS = $(AM_CFLAGS)
> -DGEN_VERSIONx10=90
>
> noinst_LTLIBRARIES = \
> libi965_dri.la \
> - libi965_compiler.la \
> $(I965_PERGEN_LIBS)
>
> libi965_dri_la_SOURCES = $(i965_FILES)
> libi965_dri_la_LIBADD = \
> $(top_builddir)/src/intel/common/libintel_common.la \
> $(top_builddir)/src/intel/isl/libisl.la \
> - libi965_compiler.la \
> + $(top_builddir)/src/intel/compiler/libintel_compiler.la \
> $(top_builddir)/src/intel/blorp/libblorp.la \
> $(I965_PERGEN_LIBS) \
> $(INTEL_LIBS)
> -
> -libi965_compiler_la_SOURCES = \
> - $(i965_compiler_FILES) \
> - $(i965_compiler_GENERATED_FILES)
> -
> -BUILT_SOURCES = $(i965_compiler_GENERATED_FILES)
> -CLEANFILES = $(BUILT_SOURCES)
> -
> -EXTRA_DIST = \
> - brw_nir_trig_workarounds.py
> -
> -TEST_LIBS = \
> - libi965_compiler.la \
> - $(I965_PERGEN_LIBS) \
> - $(top_builddir)/src/intel/common/libintel_common.la \
> - $(top_builddir)/src/compiler/nir/libnir.la \
> - $(top_builddir)/src/util/libmesautil.la \
> - $(top_builddir)/src/intel/isl/libisl.la \
> - $(PTHREAD_LIBS) \
> - $(DLOPEN_LIBS)
> -
> -TESTS = \
> - test_fs_cmod_propagation \
> - test_fs_copy_propagation \
> - test_fs_saturate_propagation \
> - test_eu_compact \
> - test_eu_validate \
> - test_vf_float_conversions \
> - test_vec4_cmod_propagation \
> - test_vec4_copy_propagation \
> - test_vec4_register_coalesce
> -
> -check_PROGRAMS = $(TESTS)
> -
> -test_fs_cmod_propagation_SOURCES = \
> - test_fs_cmod_propagation.cpp
> -test_fs_cmod_propagation_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> -
> -test_fs_copy_propagation_SOURCES = \
> - test_fs_copy_propagation.cpp
> -test_fs_copy_propagation_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> -
> -test_fs_saturate_propagation_SOURCES = \
> - test_fs_saturate_propagation.cpp
> -test_fs_saturate_propagation_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> -
> -test_vf_float_conversions_SOURCES = \
> - test_vf_float_conversions.cpp
> -test_vf_float_conversions_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> -
> -test_vec4_register_coalesce_SOURCES = \
> - test_vec4_register_coalesce.cpp
> -test_vec4_register_coalesce_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> -
> -test_vec4_copy_propagation_SOURCES = \
> - test_vec4_copy_propagation.cpp
> -test_vec4_copy_propagation_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> -
> -test_vec4_cmod_propagation_SOURCES = \
> - test_vec4_cmod_propagation.cpp
> -test_vec4_cmod_propagation_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> -
> -test_eu_compact_SOURCES = \
> - test_eu_compact.c
> -nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp
> -test_eu_compact_LDADD = $(TEST_LIBS)
> -
> -test_eu_validate_SOURCES = \
> - test_eu_validate.cpp
> -test_eu_validate_LDADD = \
> - $(top_builddir)/src/gtest/libgtest.la \
> - $(TEST_LIBS)
> diff --git a/src/mesa/drivers/dri/i965/Makefile.sources
> b/src/mesa/drivers/dri/i965/Makefile.sources
> index b1776a8513..8f69993533 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.sources
> +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> @@ -1,94 +1,3 @@
> -i965_compiler_FILES = \
> - brw_cfg.cpp \
> - brw_cfg.h \
> - brw_compiler.c \
> - brw_compiler.h \
> - brw_dead_control_flow.cpp \
> - brw_dead_control_flow.h \
> - brw_defines.h \
> - brw_disasm.c \
> - brw_eu.c \
> - brw_eu_compact.c \
> - brw_eu_emit.c \
> - brw_eu.h \
> - brw_eu_util.c \
> - brw_eu_validate.c \
> - brw_fs_builder.h \
> - brw_fs_cmod_propagation.cpp \
> - brw_fs_combine_constants.cpp \
> - brw_fs_copy_propagation.cpp \
> - brw_fs.cpp \
> - brw_fs_cse.cpp \
> - brw_fs_dead_code_eliminate.cpp \
> - brw_fs_generator.cpp \
> - brw_fs.h \
> - brw_fs_live_variables.cpp \
> - brw_fs_live_variables.h \
> - brw_fs_lower_d2x.cpp \
> - brw_fs_lower_pack.cpp \
> - brw_fs_nir.cpp \
> - brw_fs_reg_allocate.cpp \
> - brw_fs_register_coalesce.cpp \
> - brw_fs_saturate_propagation.cpp \
> - brw_fs_sel_peephole.cpp \
> - brw_fs_surface_builder.cpp \
> - brw_fs_surface_builder.h \
> - brw_fs_validate.cpp \
> - brw_fs_visitor.cpp \
> - brw_inst.h \
> - brw_interpolation_map.c \
> - brw_ir_allocator.h \
> - brw_ir_fs.h \
> - brw_ir_vec4.h \
> - brw_nir.h \
> - brw_nir.c \
> - brw_nir_analyze_boolean_resolves.c \
> - brw_nir_attribute_workarounds.c \
> - brw_nir_intrinsics.c \
> - brw_nir_opt_peephole_ffma.c \
> - brw_nir_tcs_workarounds.c \
> - brw_packed_float.c \
> - brw_predicated_break.cpp \
> - brw_reg.h \
> - brw_schedule_instructions.cpp \
> - brw_shader.cpp \
> - brw_shader.h \
> - brw_util.c \
> - brw_util.h \
> - brw_vec4_builder.h \
> - brw_vec4_cmod_propagation.cpp \
> - brw_vec4_copy_propagation.cpp \
> - brw_vec4.cpp \
> - brw_vec4_cse.cpp \
> - brw_vec4_dead_code_eliminate.cpp \
> - brw_vec4_generator.cpp \
> - brw_vec4_gs_visitor.cpp \
> - brw_vec4_gs_visitor.h \
> - brw_vec4.h \
> - brw_vec4_live_variables.cpp \
> - brw_vec4_live_variables.h \
> - brw_vec4_nir.cpp \
> - brw_vec4_gs_nir.cpp \
> - brw_vec4_reg_allocate.cpp \
> - brw_vec4_surface_builder.cpp \
> - brw_vec4_surface_builder.h \
> - brw_vec4_tcs.cpp \
> - brw_vec4_tcs.h \
> - brw_vec4_tes.cpp \
> - brw_vec4_tes.h \
> - brw_vec4_visitor.cpp \
> - brw_vec4_vs_visitor.cpp \
> - brw_vec4_vs.h \
> - brw_vue_map.c \
> - brw_wm_iz.cpp \
> - gen6_gs_visitor.cpp \
> - gen6_gs_visitor.h \
> - intel_asm_annotation.c \
> - intel_asm_annotation.h
> -
> -i965_compiler_GENERATED_FILES = \
> - brw_nir_trig_workarounds.c
> -
> i965_FILES = \
> brw_binding_tables.c \
> brw_blorp.c \
> @@ -157,6 +66,8 @@ i965_FILES = \
> brw_tes_surface_state.c \
> brw_tex_layout.c \
> brw_urb.c \
> + brw_util.c \
> + brw_util.h \
> brw_vs.c \
> brw_vs.h \
> brw_vs_state.c \
> diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c
> b/src/mesa/drivers/dri/i965/brw_binding_tables.c
> index 4c4c9c22ca..b8fe16d7ef 100644
> --- a/src/mesa/drivers/dri/i965/brw_binding_tables.c
> +++ b/src/mesa/drivers/dri/i965/brw_binding_tables.c
> @@ -40,7 +40,7 @@
> #include "main/mtypes.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
> #include "intel_batchbuffer.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c
> b/src/mesa/drivers/dri/i965/brw_blorp.c
> index 9f7ba3dd5a..6e28f14de9 100644
> --- a/src/mesa/drivers/dri/i965/brw_blorp.c
> +++ b/src/mesa/drivers/dri/i965/brw_blorp.c
> @@ -30,7 +30,7 @@
>
> #include "brw_blorp.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_meta_util.h"
> #include "brw_state.h"
> #include "intel_fbo.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_cc.c
> b/src/mesa/drivers/dri/i965/brw_cc.c
> index c3b00e1b60..52e7226ee2 100644
> --- a/src/mesa/drivers/dri/i965/brw_cc.c
> +++ b/src/mesa/drivers/dri/i965/brw_cc.c
> @@ -32,7 +32,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "main/macros.h"
> #include "main/stencil.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_clear.c
> b/src/mesa/drivers/dri/i965/brw_clear.c
> index ba9aa4b654..81afeeb88a 100644
> --- a/src/mesa/drivers/dri/i965/brw_clear.c
> +++ b/src/mesa/drivers/dri/i965/brw_clear.c
> @@ -36,7 +36,7 @@
>
> #include "brw_context.h"
> #include "brw_blorp.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> #define FILE_DEBUG_FLAG DEBUG_BLIT
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip.c
> b/src/mesa/drivers/dri/i965/brw_clip.c
> index 4187207c6d..767dc63b5c 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip.c
> @@ -34,7 +34,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_util.h"
> #include "brw_state.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_clip.h
> b/src/mesa/drivers/dri/i965/brw_clip.h
> index a8ee3948cd..9dc1f12ea5 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip.h
> +++ b/src/mesa/drivers/dri/i965/brw_clip.h
> @@ -34,7 +34,7 @@
>
>
> #include "brw_context.h"
> -#include "brw_eu.h"
> +#include "compiler/brw_eu.h"
>
> /* Initial 3 verts, plus at most 6 additional verts from intersections
> * with fixed planes, plus at most 8 additional verts from intersections
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_line.c
> b/src/mesa/drivers/dri/i965/brw_clip_line.c
> index 788dc9666c..da613bb91c 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_line.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_line.c
> @@ -35,7 +35,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_clip.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_point.c
> b/src/mesa/drivers/dri/i965/brw_clip_point.c
> index bdbf969534..e332c2e00b 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_point.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_point.c
> @@ -35,7 +35,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_clip.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_state.c
> b/src/mesa/drivers/dri/i965/brw_clip_state.c
> index 39c149c976..3426fed4fb 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_state.c
> @@ -31,7 +31,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "main/framebuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c
> b/src/mesa/drivers/dri/i965/brw_clip_tri.c
> index d98e1ccb5f..93be80f02a 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_tri.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c
> @@ -35,7 +35,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_clip.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
> b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
> index 65ccf33e37..5f0a36b10f 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c
> @@ -35,7 +35,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_clip.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_util.c
> b/src/mesa/drivers/dri/i965/brw_clip_util.c
> index e0fdd3d7ee..8b06fcaea4 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_util.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_util.c
> @@ -36,7 +36,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_clip.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_compute.c
> b/src/mesa/drivers/dri/i965/brw_compute.c
> index 16b5df7ca4..df7e438cc8 100644
> --- a/src/mesa/drivers/dri/i965/brw_compute.c
> +++ b/src/mesa/drivers/dri/i965/brw_compute.c
> @@ -31,7 +31,7 @@
> #include "brw_state.h"
> #include "intel_batchbuffer.h"
> #include "intel_buffer_objects.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/brw_conditional_render.c
> b/src/mesa/drivers/dri/i965/brw_conditional_render.c
> index 046a42b5f5..97bb9f0b4c 100644
> --- a/src/mesa/drivers/dri/i965/brw_conditional_render.c
> +++ b/src/mesa/drivers/dri/i965/brw_conditional_render.c
> @@ -34,7 +34,7 @@
> #include "main/condrender.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/brw_context.c
> b/src/mesa/drivers/dri/i965/brw_context.c
> index c8e7cc1680..9be6559295 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.c
> +++ b/src/mesa/drivers/dri/i965/brw_context.c
> @@ -51,7 +51,7 @@
> #include "utils.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_blorp.h"
> #include "brw_draw.h"
> #include "brw_state.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_context.h
> b/src/mesa/drivers/dri/i965/brw_context.h
> index 96e225cbd1..2144701e57 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.h
> +++ b/src/mesa/drivers/dri/i965/brw_context.h
> @@ -37,7 +37,7 @@
> #include "main/macros.h"
> #include "main/mtypes.h"
> #include "brw_structs.h"
> -#include "brw_compiler.h"
> +#include "compiler/brw_compiler.h"
> #include "intel_aub.h"
>
> #include "isl/isl.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_cs.c
> b/src/mesa/drivers/dri/i965/brw_cs.c
> index 1653ad59c4..eaa7381cfc 100644
> --- a/src/mesa/drivers/dri/i965/brw_cs.c
> +++ b/src/mesa/drivers/dri/i965/brw_cs.c
> @@ -28,7 +28,7 @@
> #include "intel_mipmap_tree.h"
> #include "brw_state.h"
> #include "intel_batchbuffer.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "brw_program.h"
> #include "compiler/glsl/ir_uniform.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c
> b/src/mesa/drivers/dri/i965/brw_curbe.c
> index 7d58efb622..976f184df2 100644
> --- a/src/mesa/drivers/dri/i965/brw_curbe.c
> +++ b/src/mesa/drivers/dri/i965/brw_curbe.c
> @@ -61,7 +61,7 @@
> #include "intel_batchbuffer.h"
> #include "intel_buffer_objects.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
> #include "brw_util.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_draw.c
> b/src/mesa/drivers/dri/i965/brw_draw.c
> index e3aaeb806d..b33efa8e98 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw.c
> +++ b/src/mesa/drivers/dri/i965/brw_draw.c
> @@ -42,7 +42,7 @@
>
> #include "brw_blorp.h"
> #include "brw_draw.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_state.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c
> b/src/mesa/drivers/dri/i965/brw_draw_upload.c
> index 025da5e10d..c339a6de75 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
> +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
> @@ -30,7 +30,7 @@
> #include "main/glformats.h"
>
> #include "brw_draw.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_state.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c
> b/src/mesa/drivers/dri/i965/brw_ff_gs.c
> index b7b4b71601..9148a1c2d3 100644
> --- a/src/mesa/drivers/dri/i965/brw_ff_gs.c
> +++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c
> @@ -35,7 +35,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_util.h"
> #include "brw_state.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.h
> b/src/mesa/drivers/dri/i965/brw_ff_gs.h
> index e952b6413d..bac2730b7e 100644
> --- a/src/mesa/drivers/dri/i965/brw_ff_gs.h
> +++ b/src/mesa/drivers/dri/i965/brw_ff_gs.h
> @@ -35,7 +35,7 @@
>
>
> #include "brw_context.h"
> -#include "brw_eu.h"
> +#include "compiler/brw_eu.h"
>
> #define MAX_GS_VERTS (4)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
> b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
> index 6941268c34..038f1ec048 100644
> --- a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
> +++ b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
> @@ -36,7 +36,7 @@
> #include "program/program.h"
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_ff_gs.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_gs.c
> b/src/mesa/drivers/dri/i965/brw_gs.c
> index 412ea97dc0..b8434a89f8 100644
> --- a/src/mesa/drivers/dri/i965/brw_gs.c
> +++ b/src/mesa/drivers/dri/i965/brw_gs.c
> @@ -31,7 +31,7 @@
> #include "brw_context.h"
> #include "brw_state.h"
> #include "brw_ff_gs.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "brw_program.h"
> #include "compiler/glsl/ir_uniform.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_gs_state.c
> b/src/mesa/drivers/dri/i965/brw_gs_state.c
> index 8e3bf1ef65..0ad0659b3e 100644
> --- a/src/mesa/drivers/dri/i965/brw_gs_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_gs_state.c
> @@ -33,7 +33,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> static void
> brw_upload_gs_unit(struct brw_context *brw)
> diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp
> b/src/mesa/drivers/dri/i965/brw_link.cpp
> index e124f92cba..7c10a40bdf 100644
> --- a/src/mesa/drivers/dri/i965/brw_link.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_link.cpp
> @@ -22,7 +22,7 @@
> */
>
> #include "brw_context.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "brw_program.h"
> #include "compiler/glsl/ir.h"
> #include "compiler/glsl/ir_optimization.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.c
> b/src/mesa/drivers/dri/i965/brw_meta_util.c
> index 07a160fc40..3d15e12159 100644
> --- a/src/mesa/drivers/dri/i965/brw_meta_util.c
> +++ b/src/mesa/drivers/dri/i965/brw_meta_util.c
> @@ -22,7 +22,7 @@
> */
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_fbo.h"
> #include "brw_meta_util.h"
> #include "brw_state.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c
> b/src/mesa/drivers/dri/i965/brw_misc_state.c
> index 83da94155f..c123baa6c3 100644
> --- a/src/mesa/drivers/dri/i965/brw_misc_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
> @@ -37,7 +37,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> #include "main/framebuffer.h"
> #include "main/fbobject.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
> b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
> index 024cf7914d..50bc1d07f8 100644
> --- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
> @@ -21,8 +21,7 @@
> * IN THE SOFTWARE.
> */
>
> -#include "brw_nir.h"
> -#include "brw_shader.h"
> +#include "compiler/brw_nir.h"
> #include "compiler/glsl/ir_uniform.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c
> b/src/mesa/drivers/dri/i965/brw_performance_query.c
> index 6cd5bf4caa..a46cd5965d 100644
> --- a/src/mesa/drivers/dri/i965/brw_performance_query.c
> +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c
> @@ -49,7 +49,7 @@
> #include "util/ralloc.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_performance_query.h"
> #include "intel_batchbuffer.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c
> b/src/mesa/drivers/dri/i965/brw_pipe_control.c
> index b8f740640f..37121fae41 100644
> --- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
> +++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
> @@ -22,7 +22,7 @@
> */
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "intel_fbo.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c
> b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
> index e329cc73b7..362903b215 100644
> --- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c
> +++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
> @@ -31,7 +31,7 @@
> #include "vbo/vbo.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_draw.h"
>
> #include "intel_batchbuffer.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_program.c
> b/src/mesa/drivers/dri/i965/brw_program.c
> index dbc39e53f2..34d009b69f 100644
> --- a/src/mesa/drivers/dri/i965/brw_program.c
> +++ b/src/mesa/drivers/dri/i965/brw_program.c
> @@ -43,7 +43,7 @@
>
> #include "brw_program.h"
> #include "brw_context.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/brw_program.h
> b/src/mesa/drivers/dri/i965/brw_program.h
> index 687b554b3b..2e9f12172e 100644
> --- a/src/mesa/drivers/dri/i965/brw_program.h
> +++ b/src/mesa/drivers/dri/i965/brw_program.h
> @@ -24,7 +24,7 @@
> #ifndef BRW_PROGRAM_H
> #define BRW_PROGRAM_H
>
> -#include "brw_compiler.h"
> +#include "compiler/brw_compiler.h"
>
> #ifdef __cplusplus
> extern "C" {
> diff --git a/src/mesa/drivers/dri/i965/brw_program_cache.c
> b/src/mesa/drivers/dri/i965/brw_program_cache.c
> index 0ff4683f34..6bf26f31d3 100644
> --- a/src/mesa/drivers/dri/i965/brw_program_cache.c
> +++ b/src/mesa/drivers/dri/i965/brw_program_cache.c
> @@ -51,7 +51,7 @@
> #include "brw_gs.h"
> #include "brw_cs.h"
> #include "brw_program.h"
> -#include "brw_eu.h"
> +#include "compiler/brw_eu.h"
>
> #define FILE_DEBUG_FLAG DEBUG_STATE
>
> diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c
> b/src/mesa/drivers/dri/i965/brw_queryobj.c
> index 40b86a0f64..27dba9e245 100644
> --- a/src/mesa/drivers/dri/i965/brw_queryobj.c
> +++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
> @@ -38,7 +38,7 @@
> #include "main/imports.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
> #include "intel_batchbuffer.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c
> b/src/mesa/drivers/dri/i965/brw_sampler_state.c
> index b99a89893f..499ec72bed 100644
> --- a/src/mesa/drivers/dri/i965/brw_sampler_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c
> @@ -38,7 +38,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "intel_mipmap_tree.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_sf.c
> b/src/mesa/drivers/dri/i965/brw_sf.c
> index ff15c9755f..cb34c7f035 100644
> --- a/src/mesa/drivers/dri/i965/brw_sf.c
> +++ b/src/mesa/drivers/dri/i965/brw_sf.c
> @@ -37,7 +37,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_util.h"
> #include "brw_sf.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_sf.h
> b/src/mesa/drivers/dri/i965/brw_sf.h
> index c6840dd9d2..f372656349 100644
> --- a/src/mesa/drivers/dri/i965/brw_sf.h
> +++ b/src/mesa/drivers/dri/i965/brw_sf.h
> @@ -36,7 +36,7 @@
>
> #include "program/program.h"
> #include "brw_context.h"
> -#include "brw_eu.h"
> +#include "compiler/brw_eu.h"
>
>
> #define SF_POINTS 0
> diff --git a/src/mesa/drivers/dri/i965/brw_sf_emit.c
> b/src/mesa/drivers/dri/i965/brw_sf_emit.c
> index dc905034a6..2a18e9f073 100644
> --- a/src/mesa/drivers/dri/i965/brw_sf_emit.c
> +++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c
> @@ -35,7 +35,7 @@
>
> #include "intel_batchbuffer.h"
>
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_util.h"
> #include "brw_sf.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_sf_state.c
> b/src/mesa/drivers/dri/i965/brw_sf_state.c
> index 89406fc9cb..c8ea87d45a 100644
> --- a/src/mesa/drivers/dri/i965/brw_sf_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_sf_state.c
> @@ -37,7 +37,7 @@
> #include "main/viewport.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_sf.h"
>
> static void upload_sf_vp(struct brw_context *brw)
> diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c
> b/src/mesa/drivers/dri/i965/brw_state_dump.c
> index bc9b9a352d..f56ff61b6d 100644
> --- a/src/mesa/drivers/dri/i965/brw_state_dump.c
> +++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
> @@ -31,7 +31,7 @@
> #include "isl/isl.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
>
> static const char *sampler_mip_filter[] = {
> diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c
> b/src/mesa/drivers/dri/i965/brw_surface_formats.c
> index 706818d70b..9805bc84fb 100644
> --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
> +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
> @@ -26,7 +26,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> uint32_t
> brw_format_for_mesa_format(mesa_format mesa_format)
> diff --git a/src/mesa/drivers/dri/i965/brw_tcs.c
> b/src/mesa/drivers/dri/i965/brw_tcs.c
> index 2bef1beb96..5acb77ce5f 100644
> --- a/src/mesa/drivers/dri/i965/brw_tcs.c
> +++ b/src/mesa/drivers/dri/i965/brw_tcs.c
> @@ -28,7 +28,7 @@
> */
>
> #include "brw_context.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "brw_program.h"
> #include "brw_state.h"
> #include "program/prog_parameter.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_tes.c
> b/src/mesa/drivers/dri/i965/brw_tes.c
> index 8313d38443..8309315644 100644
> --- a/src/mesa/drivers/dri/i965/brw_tes.c
> +++ b/src/mesa/drivers/dri/i965/brw_tes.c
> @@ -28,7 +28,7 @@
> */
>
> #include "brw_context.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "brw_program.h"
> #include "brw_state.h"
> #include "program/prog_parameter.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_urb.c
> b/src/mesa/drivers/dri/i965/brw_urb.c
> index d61e713800..9bfe895c87 100644
> --- a/src/mesa/drivers/dri/i965/brw_urb.c
> +++ b/src/mesa/drivers/dri/i965/brw_urb.c
> @@ -34,7 +34,7 @@
> #include "intel_batchbuffer.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> #define VS 0
> #define GS 1
> diff --git a/src/mesa/drivers/dri/i965/brw_util.c
> b/src/mesa/drivers/dri/i965/brw_util.c
> index f190a68cad..89672035a8 100644
> --- a/src/mesa/drivers/dri/i965/brw_util.c
> +++ b/src/mesa/drivers/dri/i965/brw_util.c
> @@ -31,7 +31,7 @@
>
>
> #include "brw_util.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> GLuint brw_translate_blend_equation( GLenum mode )
> {
> diff --git a/src/mesa/drivers/dri/i965/brw_vs.c
> b/src/mesa/drivers/dri/i965/brw_vs.c
> index a9c474ac06..c8be7c4dba 100644
> --- a/src/mesa/drivers/dri/i965/brw_vs.c
> +++ b/src/mesa/drivers/dri/i965/brw_vs.c
> @@ -38,7 +38,7 @@
> #include "brw_state.h"
> #include "program/prog_print.h"
> #include "program/prog_parameter.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "brw_program.h"
>
> #include "util/ralloc.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c
> b/src/mesa/drivers/dri/i965/brw_vs_state.c
> index d0d2695a49..a8d470567a 100644
> --- a/src/mesa/drivers/dri/i965/brw_vs_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
> @@ -33,7 +33,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "main/macros.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/brw_wm.c
> b/src/mesa/drivers/dri/i965/brw_wm.c
> index c1f207e951..3342e71acb 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm.c
> @@ -35,7 +35,7 @@
> #include "program/program.h"
> #include "intel_mipmap_tree.h"
> #include "intel_image.h"
> -#include "brw_nir.h"
> +#include "compiler/brw_nir.h"
> #include "brw_program.h"
>
> #include "util/ralloc.h"
> diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c
> b/src/mesa/drivers/dri/i965/brw_wm_state.c
> index 6f2ccabaa0..b36902c975 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c
> @@ -35,7 +35,7 @@
> #include "intel_fbo.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_wm.h"
> #include "compiler/nir/nir.h"
>
> diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> index e48b1e1d2d..de0a00505e 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> @@ -52,7 +52,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_wm.h"
>
> enum {
> diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c
> b/src/mesa/drivers/dri/i965/gen6_cc.c
> index 0c38930ec2..067a74c1a2 100644
> --- a/src/mesa/drivers/dri/i965/gen6_cc.c
> +++ b/src/mesa/drivers/dri/i965/gen6_cc.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "intel_batchbuffer.h"
> #include "main/macros.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c
> b/src/mesa/drivers/dri/i965/gen6_clip_state.c
> index 1c8c23730b..caf1adebcb 100644
> --- a/src/mesa/drivers/dri/i965/gen6_clip_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "intel_batchbuffer.h"
> #include "main/fbobject.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_constant_state.c
> b/src/mesa/drivers/dri/i965/gen6_constant_state.c
> index 6c0c32b26f..b238c649bc 100644
> --- a/src/mesa/drivers/dri/i965/gen6_constant_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_constant_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "program/prog_parameter.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen6_depth_state.c
> b/src/mesa/drivers/dri/i965/gen6_depth_state.c
> index 0ff240753e..76bf9cbea6 100644
> --- a/src/mesa/drivers/dri/i965/gen6_depth_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_depth_state.c
> @@ -28,7 +28,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> #include "main/mtypes.h"
> #include "main/fbobject.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_depthstencil.c
> b/src/mesa/drivers/dri/i965/gen6_depthstencil.c
> index 79d4d5da16..22e04de4e6 100644
> --- a/src/mesa/drivers/dri/i965/gen6_depthstencil.c
> +++ b/src/mesa/drivers/dri/i965/gen6_depthstencil.c
> @@ -28,7 +28,7 @@
> #include "intel_batchbuffer.h"
> #include "intel_fbo.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/gen6_gs_state.c
> b/src/mesa/drivers/dri/i965/gen6_gs_state.c
> index e9179152b3..07faba9774 100644
> --- a/src/mesa/drivers/dri/i965/gen6_gs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_gs_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "main/shaderapi.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c
> b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
> index a59ffec039..1a8509c93f 100644
> --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
> @@ -24,7 +24,7 @@
> #include "intel_batchbuffer.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_multisample_state.h"
> #include "main/framebuffer.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c
> b/src/mesa/drivers/dri/i965/gen6_queryobj.c
> index 98cbbff914..301da22882 100644
> --- a/src/mesa/drivers/dri/i965/gen6_queryobj.c
> +++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c
> @@ -34,7 +34,7 @@
> #include "main/imports.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
> #include "intel_batchbuffer.h"
> #include "intel_buffer_objects.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
> b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
> index b5a0c92b3b..891ba7d3ef 100644
> --- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/gen6_scissor_state.c
> b/src/mesa/drivers/dri/i965/gen6_scissor_state.c
> index 860445a2b4..7fe2503a83 100644
> --- a/src/mesa/drivers/dri/i965/gen6_scissor_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_scissor_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "main/fbobject.h"
> #include "main/framebuffer.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c
> b/src/mesa/drivers/dri/i965/gen6_sf_state.c
> index dd547790c9..226ba55503 100644
> --- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "compiler/nir/nir.h"
> #include "main/macros.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c
> b/src/mesa/drivers/dri/i965/gen6_sol.c
> index 132f0696e3..bc51f728ab 100644
> --- a/src/mesa/drivers/dri/i965/gen6_sol.c
> +++ b/src/mesa/drivers/dri/i965/gen6_sol.c
> @@ -30,7 +30,7 @@
> #include "main/macros.h"
> #include "brw_context.h"
> #include "intel_batchbuffer.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
> #include "main/transformfeedback.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c
> b/src/mesa/drivers/dri/i965/gen6_urb.c
> index e69a1dfada..a5ed21f342 100644
> --- a/src/mesa/drivers/dri/i965/gen6_urb.c
> +++ b/src/mesa/drivers/dri/i965/gen6_urb.c
> @@ -29,7 +29,7 @@
> #include "intel_batchbuffer.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> /**
> * When the GS is not in use, we assign the entire URB space to the VS.
> When
> diff --git a/src/mesa/drivers/dri/i965/gen6_viewport_state.c
> b/src/mesa/drivers/dri/i965/gen6_viewport_state.c
> index 569e5bd4a1..010aaffb68 100644
> --- a/src/mesa/drivers/dri/i965/gen6_viewport_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_viewport_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "main/fbobject.h"
> #include "main/framebuffer.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c
> b/src/mesa/drivers/dri/i965/gen6_vs_state.c
> index 837762d391..d7bd38c400 100644
> --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "program/prog_parameter.h"
> #include "program/prog_statevars.h"
> diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c
> b/src/mesa/drivers/dri/i965/gen6_wm_state.c
> index a67e626f72..c28840a1b2 100644
> --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c
> @@ -27,7 +27,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "brw_wm.h"
> #include "program/program.h"
> diff --git a/src/mesa/drivers/dri/i965/gen7_cs_state.c
> b/src/mesa/drivers/dri/i965/gen7_cs_state.c
> index d8df6bb8d2..feacc4a833 100644
> --- a/src/mesa/drivers/dri/i965/gen7_cs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_cs_state.c
> @@ -23,7 +23,7 @@
>
> #include "util/ralloc.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_cs.h"
> #include "brw_wm.h"
> #include "intel_mipmap_tree.h"
> diff --git a/src/mesa/drivers/dri/i965/gen7_ds_state.c
> b/src/mesa/drivers/dri/i965/gen7_ds_state.c
> index 9d7f5315de..97ac1959be 100644
> --- a/src/mesa/drivers/dri/i965/gen7_ds_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_ds_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "main/shaderapi.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen7_gs_state.c
> b/src/mesa/drivers/dri/i965/gen7_gs_state.c
> index 1b5b78290b..be35a1bec0 100644
> --- a/src/mesa/drivers/dri/i965/gen7_gs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_gs_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/gen7_hs_state.c
> b/src/mesa/drivers/dri/i965/gen7_hs_state.c
> index fadea2351d..72b3c06b4e 100644
> --- a/src/mesa/drivers/dri/i965/gen7_hs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_hs_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "main/shaderapi.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen7_l3_state.c
> b/src/mesa/drivers/dri/i965/gen7_l3_state.c
> index 536c00c454..ad98c70b4b 100644
> --- a/src/mesa/drivers/dri/i965/gen7_l3_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_l3_state.c
> @@ -24,7 +24,7 @@
> #include "common/gen_l3_config.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
> #include "intel_batchbuffer.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen7_misc_state.c
> b/src/mesa/drivers/dri/i965/gen7_misc_state.c
> index af9be66ff8..12f15c01e9 100644
> --- a/src/mesa/drivers/dri/i965/gen7_misc_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_misc_state.c
> @@ -27,7 +27,7 @@
> #include "intel_fbo.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> void
> gen7_emit_depth_stencil_hiz(struct brw_context *brw,
> diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c
> b/src/mesa/drivers/dri/i965/gen7_sf_state.c
> index d577a36015..486f38bc2f 100644
> --- a/src/mesa/drivers/dri/i965/gen7_sf_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "main/macros.h"
> #include "main/fbobject.h"
> diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c
> b/src/mesa/drivers/dri/i965/gen7_sol_state.c
> index a4f46ea486..61a173f89c 100644
> --- a/src/mesa/drivers/dri/i965/gen7_sol_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c
> @@ -30,7 +30,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "intel_buffer_objects.h"
> #include "main/transformfeedback.h"
> diff --git a/src/mesa/drivers/dri/i965/gen7_te_state.c
> b/src/mesa/drivers/dri/i965/gen7_te_state.c
> index e56fdcf4e8..bfd190e23a 100644
> --- a/src/mesa/drivers/dri/i965/gen7_te_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_te_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c
> b/src/mesa/drivers/dri/i965/gen7_urb.c
> index 028161df39..a06590dd54 100644
> --- a/src/mesa/drivers/dri/i965/gen7_urb.c
> +++ b/src/mesa/drivers/dri/i965/gen7_urb.c
> @@ -25,7 +25,7 @@
> #include "intel_batchbuffer.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> #include "common/gen_l3_config.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen7_viewport_state.c
> b/src/mesa/drivers/dri/i965/gen7_viewport_state.c
> index 000f238f3f..91ee44dc50 100644
> --- a/src/mesa/drivers/dri/i965/gen7_viewport_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_viewport_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "main/fbobject.h"
> #include "main/framebuffer.h"
> diff --git a/src/mesa/drivers/dri/i965/gen7_vs_state.c
> b/src/mesa/drivers/dri/i965/gen7_vs_state.c
> index 623c78471f..c1c6a2f017 100644
> --- a/src/mesa/drivers/dri/i965/gen7_vs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_vs_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "program/prog_parameter.h"
> #include "program/prog_statevars.h"
> diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c
> b/src/mesa/drivers/dri/i965/gen7_wm_state.c
> index be026e0589..84b654c507 100644
> --- a/src/mesa/drivers/dri/i965/gen7_wm_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c
> @@ -24,7 +24,7 @@
> #include <stdbool.h>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "brw_wm.h"
> #include "program/program.h"
> diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> index e30dbb336d..518cdb2707 100644
> --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
> @@ -36,7 +36,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_wm.h"
>
> void
> diff --git a/src/mesa/drivers/dri/i965/gen8_blend_state.c
> b/src/mesa/drivers/dri/i965/gen8_blend_state.c
> index 2e4e8bfed1..ad7623879d 100644
> --- a/src/mesa/drivers/dri/i965/gen8_blend_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_blend_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "brw_wm.h"
> #include "intel_batchbuffer.h"
> diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c
> b/src/mesa/drivers/dri/i965/gen8_depth_state.c
> index a7e61354fd..36c04b390d 100644
> --- a/src/mesa/drivers/dri/i965/gen8_depth_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_depth_state.c
> @@ -27,7 +27,7 @@
> #include "intel_resolve_map.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_wm.h"
> #include "main/framebuffer.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen8_draw_upload.c
> b/src/mesa/drivers/dri/i965/gen8_draw_upload.c
> index 32e144741a..e1ee4ea50d 100644
> --- a/src/mesa/drivers/dri/i965/gen8_draw_upload.c
> +++ b/src/mesa/drivers/dri/i965/gen8_draw_upload.c
> @@ -27,7 +27,7 @@
> #include "main/macros.h"
>
> #include "brw_draw.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_context.h"
> #include "brw_state.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen8_ds_state.c
> b/src/mesa/drivers/dri/i965/gen8_ds_state.c
> index ee2f82e109..d7ffdbe3b8 100644
> --- a/src/mesa/drivers/dri/i965/gen8_ds_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_ds_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/gen8_gs_state.c
> b/src/mesa/drivers/dri/i965/gen8_gs_state.c
> index 2b74f1bd57..5db96e90f8 100644
> --- a/src/mesa/drivers/dri/i965/gen8_gs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_gs_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/gen8_hs_state.c
> b/src/mesa/drivers/dri/i965/gen8_hs_state.c
> index ee47e5e54a..43c64a673f 100644
> --- a/src/mesa/drivers/dri/i965/gen8_hs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_hs_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> static void
> diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c
> b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
> index e36d037d47..eb051ab94a 100644
> --- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
> @@ -24,7 +24,7 @@
> #include "intel_batchbuffer.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_multisample_state.h"
>
> /**
> diff --git a/src/mesa/drivers/dri/i965/gen8_ps_state.c
> b/src/mesa/drivers/dri/i965/gen8_ps_state.c
> index 03468267ce..149f4eda2e 100644
> --- a/src/mesa/drivers/dri/i965/gen8_ps_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_ps_state.c
> @@ -24,7 +24,7 @@
> #include <stdbool.h>
> #include "program/program.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_wm.h"
> #include "intel_batchbuffer.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen8_sf_state.c
> b/src/mesa/drivers/dri/i965/gen8_sf_state.c
> index 41e94fb504..edf2d602fc 100644
> --- a/src/mesa/drivers/dri/i965/gen8_sf_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_sf_state.c
> @@ -24,7 +24,7 @@
> #include "compiler/nir/nir.h"
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "main/macros.h"
> #include "main/fbobject.h"
> diff --git a/src/mesa/drivers/dri/i965/gen8_sol_state.c
> b/src/mesa/drivers/dri/i965/gen8_sol_state.c
> index 21cc129088..8da08f16d8 100644
> --- a/src/mesa/drivers/dri/i965/gen8_sol_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_sol_state.c
> @@ -30,7 +30,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "intel_buffer_objects.h"
> #include "main/transformfeedback.h"
> diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c
> b/src/mesa/drivers/dri/i965/gen8_surface_state.c
> index 501531d4ad..2eea4a4c2e 100644
> --- a/src/mesa/drivers/dri/i965/gen8_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c
> @@ -38,7 +38,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_wm.h"
> #include "isl/isl.h"
>
> diff --git a/src/mesa/drivers/dri/i965/gen8_viewport_state.c
> b/src/mesa/drivers/dri/i965/gen8_viewport_state.c
> index 101ad2b110..747151858a 100644
> --- a/src/mesa/drivers/dri/i965/gen8_viewport_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_viewport_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "main/fbobject.h"
> #include "main/framebuffer.h"
> diff --git a/src/mesa/drivers/dri/i965/gen8_vs_state.c
> b/src/mesa/drivers/dri/i965/gen8_vs_state.c
> index 7b66da4b17..c45ea78546 100644
> --- a/src/mesa/drivers/dri/i965/gen8_vs_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_vs_state.c
> @@ -23,7 +23,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_util.h"
> #include "program/prog_parameter.h"
> #include "program/prog_statevars.h"
> diff --git a/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
> b/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
> index 9a6c9e060b..f61da141ae 100644
> --- a/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
> +++ b/src/mesa/drivers/dri/i965/gen8_wm_depth_stencil.c
> @@ -24,7 +24,7 @@
> #include "intel_batchbuffer.h"
> #include "intel_fbo.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
> #include "main/stencil.h"
>
> diff --git a/src/mesa/drivers/dri/i965/hsw_queryobj.c
> b/src/mesa/drivers/dri/i965/hsw_queryobj.c
> index 938fe06c87..6cd2a0f6f8 100644
> --- a/src/mesa/drivers/dri/i965/hsw_queryobj.c
> +++ b/src/mesa/drivers/dri/i965/hsw_queryobj.c
> @@ -29,7 +29,7 @@
> #include "main/imports.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "intel_buffer_objects.h"
>
> diff --git a/src/mesa/drivers/dri/i965/hsw_sol.c
> b/src/mesa/drivers/dri/i965/hsw_sol.c
> index b0dd150b7d..09f7e5795a 100644
> --- a/src/mesa/drivers/dri/i965/hsw_sol.c
> +++ b/src/mesa/drivers/dri/i965/hsw_sol.c
> @@ -30,7 +30,7 @@
>
> #include "brw_context.h"
> #include "brw_state.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
> #include "intel_buffer_objects.h"
> #include "main/transformfeedback.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> index afa061d70d..a54fd27a32 100644
> --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
> @@ -29,7 +29,7 @@
> #include "intel_buffers.h"
> #include "intel_fbo.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "brw_state.h"
>
> #include <xf86drm.h>
> diff --git a/src/mesa/drivers/dri/i965/intel_blit.c
> b/src/mesa/drivers/dri/i965/intel_blit.c
> index 4d4ab911cb..6a566118b5 100644
> --- a/src/mesa/drivers/dri/i965/intel_blit.c
> +++ b/src/mesa/drivers/dri/i965/intel_blit.c
> @@ -30,7 +30,7 @@
> #include "main/fbobject.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_blit.h"
> #include "intel_buffers.h"
> #include "intel_fbo.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c
> b/src/mesa/drivers/dri/i965/intel_extensions.c
> index 30f2c37695..0ff6add4a9 100644
> --- a/src/mesa/drivers/dri/i965/intel_extensions.c
> +++ b/src/mesa/drivers/dri/i965/intel_extensions.c
> @@ -26,7 +26,7 @@
> #include "main/version.h"
>
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_batchbuffer.h"
>
> /**
> diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c
> b/src/mesa/drivers/dri/i965/intel_fbo.c
> index de0cd6aca2..e66ddb9d68 100644
> --- a/src/mesa/drivers/dri/i965/intel_fbo.c
> +++ b/src/mesa/drivers/dri/i965/intel_fbo.c
> @@ -49,7 +49,7 @@
> #include "intel_screen.h"
> #include "intel_tex.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> #define FILE_DEBUG_FLAG DEBUG_FBO
>
> diff --git a/src/mesa/drivers/dri/i965/intel_screen.c
> b/src/mesa/drivers/dri/i965/intel_screen.c
> index 21786eb54a..8dce661864 100644
> --- a/src/mesa/drivers/dri/i965/intel_screen.c
> +++ b/src/mesa/drivers/dri/i965/intel_screen.c
> @@ -35,7 +35,7 @@
> #include "main/version.h"
> #include "swrast/s_renderbuffer.h"
> #include "util/ralloc.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "compiler/nir/nir.h"
>
> #include "utils.h"
> diff --git a/src/mesa/drivers/dri/i965/intel_state.c
> b/src/mesa/drivers/dri/i965/intel_state.c
> index 5001a49faf..7809b3b66b 100644
> --- a/src/mesa/drivers/dri/i965/intel_state.c
> +++ b/src/mesa/drivers/dri/i965/intel_state.c
> @@ -30,7 +30,7 @@
>
> #include "intel_screen.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
>
> int
> intel_translate_shadow_compare_func(GLenum func)
> diff --git a/src/mesa/drivers/dri/i965/intel_tex.c
> b/src/mesa/drivers/dri/i965/intel_tex.c
> index 12a346838f..77cb2edb8d 100644
> --- a/src/mesa/drivers/dri/i965/intel_tex.c
> +++ b/src/mesa/drivers/dri/i965/intel_tex.c
> @@ -5,7 +5,7 @@
> #include "main/mipmap.h"
> #include "drivers/common/meta.h"
> #include "brw_context.h"
> -#include "brw_defines.h"
> +#include "compiler/brw_defines.h"
> #include "intel_buffer_objects.h"
> #include "intel_mipmap_tree.h"
> #include "intel_tex.h"
> --
> 2.11.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170308/42af3901/attachment-0001.html>
More information about the mesa-dev
mailing list