i965: Break out backend compiler to its own library

This introduces a new libtool helper library, libi965_compiler.la.  This
library is moderately self-contained, but still needs to link to all of
libmesa.la among other things.

Reviewed-by: Jason Ekstrand <[email protected]>
Signed-off-by: Kristian Høgsberg Kristensen <[email protected]>

2 files changed, 81 insertions, 77 deletions

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 566f2ddd98f..82e58a6baa8 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -41,9 +41,11 @@ AM_CFLAGS = \
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-noinst_LTLIBRARIES = libi965_dri.la
+noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la
 libi965_dri_la_SOURCES = $(i965_FILES)
-libi965_dri_la_LIBADD = $(INTEL_LIBS)
+libi965_dri_la_LIBADD = libi965_compiler.la $(INTEL_LIBS)
+
+libi965_compiler_la_SOURCES = $(i965_compiler_FILES)
 
 TEST_LIBS = \
 	libi965_dri.la \
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 7e1586ffbbd..81ef6283fa1 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -1,47 +1,18 @@
-i965_FILES = \
-	brw_binding_tables.c \
-	brw_blorp_blit.cpp \
-	brw_blorp_blit_eu.cpp \
-	brw_blorp_blit_eu.h \
-	brw_blorp.cpp \
-	brw_blorp.h \
-	brw_cc.c \
+i965_compiler_FILES = \
 	brw_cfg.cpp \
 	brw_cfg.h \
-	brw_clear.c \
-	brw_clip.c \
-	brw_clip.h \
-	brw_clip_line.c \
-	brw_clip_point.c \
-	brw_clip_state.c \
-	brw_clip_tri.c \
-	brw_clip_unfilled.c \
-	brw_clip_util.c \
-	brw_compute.c \
-	brw_conditional_render.c \
-	brw_context.c \
-	brw_context.h \
-	brw_cs.c \
-	brw_cs.h \
 	brw_cubemap_normalize.cpp \
-	brw_curbe.c \
 	brw_dead_control_flow.cpp \
 	brw_dead_control_flow.h \
 	brw_defines.h \
 	brw_device_info.c \
 	brw_device_info.h \
 	brw_disasm.c \
-	brw_draw.c \
-	brw_draw.h \
-	brw_draw_upload.c \
 	brw_eu.c \
 	brw_eu_compact.c \
 	brw_eu_emit.c \
 	brw_eu.h \
 	brw_eu_util.c \
-	brw_ff_gs.c \
-	brw_ff_gs_emit.c \
-	brw_ff_gs.h \
 	brw_fs_builder.h \
 	brw_fs_channel_expressions.cpp \
 	brw_fs_cmod_propagation.cpp \
@@ -64,58 +35,24 @@ i965_FILES = \
 	brw_fs_validate.cpp \
 	brw_fs_vector_splitting.cpp \
 	brw_fs_visitor.cpp \
-	brw_gs.c \
-	brw_gs.h \
-	brw_gs_state.c \
-	brw_gs_surface_state.c \
 	brw_inst.h \
 	brw_interpolation_map.c \
 	brw_ir_allocator.h \
 	brw_ir_fs.h \
 	brw_ir_vec4.h \
-	brw_link.cpp \
 	brw_lower_texture_gradients.cpp \
 	brw_lower_unnormalized_offset.cpp \
-	brw_meta_fast_clear.c \
-	brw_meta_stencil_blit.c \
-	brw_meta_updownsample.c \
-	brw_meta_util.c \
-	brw_meta_util.h \
-	brw_misc_state.c \
-	brw_multisample_state.h \
 	brw_nir.h \
 	brw_nir.c \
 	brw_nir_analyze_boolean_resolves.c \
 	brw_nir_uniforms.cpp \
-	brw_object_purgeable.c \
 	brw_packed_float.c \
-	brw_performance_monitor.c \
-	brw_pipe_control.c \
 	brw_predicated_break.cpp \
-	brw_primitive_restart.c \
-	brw_program.c \
-	brw_program.h \
-	brw_queryobj.c \
 	brw_reg.h \
-	brw_reset.c \
-	brw_sampler_state.c \
 	brw_schedule_instructions.cpp \
-	brw_sf.c \
-	brw_sf_emit.c \
-	brw_sf.h \
-	brw_sf_state.c \
 	brw_shader.cpp \
 	brw_shader.h \
-	brw_state_batch.c \
-	brw_state_cache.c \
-	brw_state_dump.c \
-	brw_state.h \
-	brw_state_upload.c \
-	brw_structs.h \
 	brw_surface_formats.c \
-	brw_tex.c \
-	brw_tex_layout.c \
-	brw_urb.c \
 	brw_util.c \
 	brw_util.h \
 	brw_vec4_builder.h \
@@ -136,14 +73,88 @@ i965_FILES = \
 	brw_vec4_surface_builder.h \
 	brw_vec4_visitor.cpp \
 	brw_vec4_vs_visitor.cpp \
+	brw_vue_map.c \
+	brw_wm_iz.cpp \
+	gen6_gs_visitor.cpp \
+	gen6_gs_visitor.h \
+	intel_asm_annotation.c \
+	intel_asm_annotation.h \
+	intel_debug.c \
+	intel_debug.h \
+	intel_reg.h \
+	intel_resolve_map.c \
+	intel_resolve_map.h
+
+i965_FILES = \
+	brw_binding_tables.c \
+	brw_blorp_blit.cpp \
+	brw_blorp_blit_eu.cpp \
+	brw_blorp_blit_eu.h \
+	brw_blorp.cpp \
+	brw_blorp.h \
+	brw_cc.c \
+	brw_clear.c \
+	brw_clip.c \
+	brw_clip.h \
+	brw_clip_line.c \
+	brw_clip_point.c \
+	brw_clip_state.c \
+	brw_clip_tri.c \
+	brw_clip_unfilled.c \
+	brw_clip_util.c \
+	brw_compute.c \
+	brw_conditional_render.c \
+	brw_context.c \
+	brw_context.h \
+	brw_cs.c \
+	brw_cs.h \
+	brw_curbe.c \
+	brw_draw.c \
+	brw_draw.h \
+	brw_draw_upload.c \
+	brw_ff_gs.c \
+	brw_ff_gs_emit.c \
+	brw_ff_gs.h \
+	brw_gs.c \
+	brw_gs.h \
+	brw_gs_state.c \
+	brw_gs_surface_state.c \
+	brw_link.cpp \
+	brw_meta_fast_clear.c \
+	brw_meta_stencil_blit.c \
+	brw_meta_updownsample.c \
+	brw_meta_util.c \
+	brw_meta_util.h \
+	brw_misc_state.c \
+	brw_multisample_state.h \
+	brw_object_purgeable.c \
+	brw_performance_monitor.c \
+	brw_pipe_control.c \
+	brw_program.c \
+	brw_program.h \
+	brw_primitive_restart.c \
+	brw_queryobj.c \
+	brw_reset.c \
+	brw_sampler_state.c \
+	brw_sf.c \
+	brw_sf_emit.c \
+	brw_sf.h \
+	brw_sf_state.c \
+	brw_state_batch.c \
+	brw_state_cache.c \
+	brw_state_dump.c \
+	brw_state.h \
+	brw_state_upload.c \
+	brw_structs.h \
+	brw_tex.c \
+	brw_tex_layout.c \
+	brw_urb.c \
 	brw_vs.c \
 	brw_vs.h \
 	brw_vs_state.c \
 	brw_vs_surface_state.c \
-	brw_vue_map.c \
 	brw_wm.c \
 	brw_wm.h \
-	brw_wm_iz.cpp \
 	brw_wm_state.c \
 	brw_wm_surface_state.c \
 	gen6_blorp.cpp \
@@ -153,8 +164,6 @@ i965_FILES = \
 	gen6_depth_state.c \
 	gen6_depthstencil.c \
 	gen6_gs_state.c \
-	gen6_gs_visitor.cpp \
-	gen6_gs_visitor.h \
 	gen6_multisample_state.c \
 	gen6_queryobj.c \
 	gen6_sampler_state.c \
@@ -193,8 +202,6 @@ i965_FILES = \
 	gen8_viewport_state.c \
 	gen8_vs_state.c \
 	gen8_wm_depth_stencil.c \
-	intel_asm_annotation.c \
-	intel_asm_annotation.h \
 	intel_batchbuffer.c \
 	intel_batchbuffer.h \
 	intel_blit.c \
@@ -204,8 +211,6 @@ i965_FILES = \
 	intel_buffers.c \
 	intel_buffers.h \
 	intel_copy_image.c \
-	intel_debug.c \
-	intel_debug.h \
 	intel_extensions.c \
 	intel_fbo.c \
 	intel_fbo.h \
@@ -218,9 +223,6 @@ i965_FILES = \
 	intel_pixel_draw.c \
 	intel_pixel.h \
 	intel_pixel_read.c \
-	intel_reg.h \
-	intel_resolve_map.c \
-	intel_resolve_map.h \
 	intel_screen.c \
 	intel_screen.h \
 	intel_state.c \