[Mesa-dev] [PATCH 1/2] i965: Factor source lists into Makefile.sources

Thu Aug 25 22:45:53 PDT 2011

Any comments from the Intel guys? I plan on pushing this Friday if
no one objects.

-- 
Chad Versace
chad at chad-versace.us

On 08/23/2011 05:04 PM, Chad Versace wrote:
> In preparation for porting i965 to Android, factor its source lists into
> a shared makefile. This prevents duplication of source lists, and hence
> prevents the Android from breaking as often.
> 
> Signed-off-by: Chad Versace <chad at chad-versace.us>
> ---
>  src/mesa/drivers/dri/i965/Makefile         |  132 ++--------------------------
>  src/mesa/drivers/dri/i965/Makefile.sources |  119 +++++++++++++++++++++++++
>  2 files changed, 127 insertions(+), 124 deletions(-)
>  create mode 100644 src/mesa/drivers/dri/i965/Makefile.sources
> 
> diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile
> index d9c885d..b64b95a 100644
> --- a/src/mesa/drivers/dri/i965/Makefile
> +++ b/src/mesa/drivers/dri/i965/Makefile
> @@ -1,136 +1,20 @@
>  
>  TOP = ../../../../..
> +MESA_TOP := $(TOP)
> +
>  include $(TOP)/configs/current
>  
>  LIBNAME = i965_dri.so
>  
> +include Makefile.sources
>  include ../Makefile.defines
>  
> -DRIVER_SOURCES = \
> -	intel_batchbuffer.c \
> -	intel_blit.c \
> -	intel_buffer_objects.c \
> -	intel_buffers.c \
> -	intel_clear.c \
> -	intel_context.c \
> -	intel_decode.c \
> -	intel_extensions.c \
> -	intel_extensions_es2.c \
> -	intel_fbo.c \
> -	intel_mipmap_tree.c \
> -	intel_regions.c \
> -	intel_screen.c \
> -	intel_span.c \
> -	intel_pixel.c \
> -	intel_pixel_bitmap.c \
> -	intel_pixel_copy.c \
> -	intel_pixel_draw.c \
> -	intel_pixel_read.c \
> -	intel_state.c \
> -	intel_syncobj.c \
> -	intel_tex.c \
> -	intel_tex_copy.c \
> -	intel_tex_format.c \
> -	intel_tex_image.c \
> -	intel_tex_layout.c \
> -	intel_tex_subimage.c \
> -	intel_tex_validate.c \
> -	brw_cc.c \
> -	brw_clip.c \
> -	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_context.c \
> -	brw_curbe.c \
> -	brw_disasm.c \
> -	brw_draw.c \
> -	brw_draw_upload.c \
> -	brw_eu.c \
> -	brw_eu_debug.c \
> -	brw_eu_emit.c \
> -	brw_eu_util.c \
> -	brw_fallback.c \
> -	brw_gs.c \
> -	brw_gs_emit.c \
> -	brw_gs_state.c \
> -	brw_misc_state.c \
> -	brw_optimize.c \
> -	brw_program.c \
> -	brw_queryobj.c \
> -	brw_sf.c \
> -	brw_sf_emit.c \
> -	brw_sf_state.c \
> -	brw_state_batch.c \
> -	brw_state_cache.c \
> -	brw_state_dump.c \
> -	brw_state_upload.c \
> -	brw_tex.c \
> -	brw_tex_layout.c \
> -	brw_urb.c \
> -	brw_util.c \
> -	brw_vs.c \
> -	brw_vs_constval.c \
> -	brw_vs_emit.c \
> -	brw_vs_state.c \
> -	brw_vs_surface_state.c \
> -	brw_vtbl.c \
> -	brw_wm.c \
> -	brw_wm_debug.c \
> -	brw_wm_emit.c \
> -	brw_wm_fp.c \
> -	brw_wm_iz.c \
> -	brw_wm_pass0.c \
> -	brw_wm_pass1.c \
> -	brw_wm_pass2.c \
> -	brw_wm_sampler_state.c \
> -	brw_wm_state.c \
> -	brw_wm_surface_state.c \
> -	gen6_cc.c \
> -	gen6_clip_state.c \
> -	gen6_depthstencil.c \
> -	gen6_gs_state.c \
> -	gen6_sampler_state.c \
> -	gen6_scissor_state.c \
> -	gen6_sf_state.c \
> -	gen6_urb.c \
> -	gen6_viewport_state.c \
> -	gen6_vs_state.c \
> -	gen6_wm_state.c \
> -	gen7_cc_state.c \
> -	gen7_clip_state.c \
> -	gen7_disable.c \
> -	gen7_misc_state.c \
> -	gen7_sampler_state.c \
> -	gen7_sf_state.c \
> -	gen7_urb.c \
> -	gen7_viewport_state.c \
> -	gen7_vs_state.c \
> -	gen7_wm_state.c \
> -	gen7_wm_surface_state.c \
> -
> -C_SOURCES = \
> -	$(COMMON_SOURCES) \
> -	$(DRIVER_SOURCES)
> -
> -CXX_SOURCES = \
> -	brw_cubemap_normalize.cpp \
> -	brw_fs.cpp \
> -	brw_fs_emit.cpp \
> -	brw_fs_visitor.cpp \
> -	brw_fs_channel_expressions.cpp \
> -	brw_fs_reg_allocate.cpp \
> -	brw_fs_schedule_instructions.cpp \
> -	brw_fs_vector_splitting.cpp \
> -	brw_shader.cpp \
> -	brw_vec4.cpp \
> -	brw_vec4_emit.cpp \
> -	brw_vec4_reg_allocate.cpp \
> -	brw_vec4_visitor.cpp
> +C_SOURCES := \
> +	$(i965_C_SOURCES) \
> +	$(COMMON_SOURCES)
>  
> -ASM_SOURCES = 
> +CXX_SOURCES := $(i965_CXX_SOURCES)
> +ASM_SOURCES :=
>  
>  DRIVER_DEFINES = -I../intel
>  
> diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
> new file mode 100644
> index 0000000..e65be42
> --- /dev/null
> +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> @@ -0,0 +1,119 @@
> +i965_C_SOURCES := \
> +	intel_batchbuffer.c \
> +	intel_blit.c \
> +	intel_buffer_objects.c \
> +	intel_buffers.c \
> +	intel_clear.c \
> +	intel_context.c \
> +	intel_decode.c \
> +	intel_extensions.c \
> +	intel_extensions_es2.c \
> +	intel_fbo.c \
> +	intel_mipmap_tree.c \
> +	intel_regions.c \
> +	intel_screen.c \
> +	intel_span.c \
> +	intel_pixel.c \
> +	intel_pixel_bitmap.c \
> +	intel_pixel_copy.c \
> +	intel_pixel_draw.c \
> +	intel_pixel_read.c \
> +	intel_state.c \
> +	intel_syncobj.c \
> +	intel_tex.c \
> +	intel_tex_copy.c \
> +	intel_tex_format.c \
> +	intel_tex_image.c \
> +	intel_tex_layout.c \
> +	intel_tex_subimage.c \
> +	intel_tex_validate.c \
> +	brw_cc.c \
> +	brw_clip.c \
> +	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_context.c \
> +	brw_curbe.c \
> +	brw_disasm.c \
> +	brw_draw.c \
> +	brw_draw_upload.c \
> +	brw_eu.c \
> +	brw_eu_debug.c \
> +	brw_eu_emit.c \
> +	brw_eu_util.c \
> +	brw_fallback.c \
> +	brw_gs.c \
> +	brw_gs_emit.c \
> +	brw_gs_state.c \
> +	brw_misc_state.c \
> +	brw_optimize.c \
> +	brw_program.c \
> +	brw_queryobj.c \
> +	brw_sf.c \
> +	brw_sf_emit.c \
> +	brw_sf_state.c \
> +	brw_state_batch.c \
> +	brw_state_cache.c \
> +	brw_state_dump.c \
> +	brw_state_upload.c \
> +	brw_tex.c \
> +	brw_tex_layout.c \
> +	brw_urb.c \
> +	brw_util.c \
> +	brw_vs.c \
> +	brw_vs_constval.c \
> +	brw_vs_emit.c \
> +	brw_vs_state.c \
> +	brw_vs_surface_state.c \
> +	brw_vtbl.c \
> +	brw_wm.c \
> +	brw_wm_debug.c \
> +	brw_wm_emit.c \
> +	brw_wm_fp.c \
> +	brw_wm_iz.c \
> +	brw_wm_pass0.c \
> +	brw_wm_pass1.c \
> +	brw_wm_pass2.c \
> +	brw_wm_sampler_state.c \
> +	brw_wm_state.c \
> +	brw_wm_surface_state.c \
> +	gen6_cc.c \
> +	gen6_clip_state.c \
> +	gen6_depthstencil.c \
> +	gen6_gs_state.c \
> +	gen6_sampler_state.c \
> +	gen6_scissor_state.c \
> +	gen6_sf_state.c \
> +	gen6_urb.c \
> +	gen6_viewport_state.c \
> +	gen6_vs_state.c \
> +	gen6_wm_state.c \
> +	gen7_cc_state.c \
> +	gen7_clip_state.c \
> +	gen7_disable.c \
> +	gen7_misc_state.c \
> +	gen7_sampler_state.c \
> +	gen7_sf_state.c \
> +	gen7_urb.c \
> +	gen7_viewport_state.c \
> +	gen7_vs_state.c \
> +	gen7_wm_state.c \
> +	gen7_wm_surface_state.c \
> +
> +i965_CXX_SOURCES := \
> +	brw_cubemap_normalize.cpp \
> +	brw_fs.cpp \
> +	brw_fs_emit.cpp \
> +	brw_fs_visitor.cpp \
> +	brw_fs_channel_expressions.cpp \
> +	brw_fs_reg_allocate.cpp \
> +	brw_fs_schedule_instructions.cpp \
> +	brw_fs_vector_splitting.cpp \
> +	brw_shader.cpp \
> +	brw_vec4.cpp \
> +	brw_vec4_emit.cpp \
> +	brw_vec4_reg_allocate.cpp \
> +	brw_vec4_visitor.cpp