[Mesa-dev] [PATCH v03 17/38] genxml: Add rules to build gen4, gen45 and ge5.

[Pohjolainen, Topi]

In the subject: s/ge5/gen5/

But don't we need to squash this into the previous patch? Alone that patch
won't even link, right?

On Mon, May 01, 2017 at 06:43:05PM -0700, Rafael Antognolli wrote:
> Signed-off-by: Rafael Antognolli <rafael.antognolli at intel.com>
> ---
>  src/mesa/drivers/dri/i965/Makefile.am      | 12 ++++++++++++
>  src/mesa/drivers/dri/i965/Makefile.sources |  9 +++++++++
>  src/mesa/drivers/dri/i965/brw_state.h      |  1 +
>  3 files changed, 22 insertions(+)
> 
> diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
> index 4e9b062..762aefc 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.am
> +++ b/src/mesa/drivers/dri/i965/Makefile.am
> @@ -46,12 +46,24 @@ AM_CFLAGS = \
>  AM_CXXFLAGS = $(AM_CFLAGS)
>  
>  I965_PERGEN_LIBS = \
> +	libi965_gen4.la \
> +	libi965_gen45.la \
> +	libi965_gen5.la \
>  	libi965_gen6.la \
>  	libi965_gen7.la \
>  	libi965_gen75.la \
>  	libi965_gen8.la \
>  	libi965_gen9.la
>  
> +libi965_gen4_la_SOURCES = $(i965_gen4_FILES)
> +libi965_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40
> +
> +libi965_gen45_la_SOURCES = $(i965_gen45_FILES)
> +libi965_gen45_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=45
> +
> +libi965_gen5_la_SOURCES = $(i965_gen5_FILES)
> +libi965_gen5_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=50
> +
>  libi965_gen6_la_SOURCES = $(i965_gen6_FILES)
>  libi965_gen6_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=60
>  
> diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
> index db55a3f..41f4d83 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.sources
> +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> @@ -160,6 +160,15 @@ i965_FILES = \
>  	intel_upload.c \
>  	libdrm_macros.h
>  
> +i965_gen4_FILES = \
> +	genX_state_upload.c
> +
> +i965_gen45_FILES = \
> +	genX_state_upload.c
> +
> +i965_gen5_FILES = \
> +	genX_state_upload.c
> +
>  i965_gen6_FILES = \
>  	genX_blorp_exec.c \
>  	genX_state_upload.c
> diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
> index 008326a..6403570 100644
> --- a/src/mesa/drivers/dri/i965/brw_state.h
> +++ b/src/mesa/drivers/dri/i965/brw_state.h
> @@ -446,6 +446,7 @@ void brw_copy_pipeline_atoms(struct brw_context *brw,
>                               const struct brw_tracked_state **atoms,
>                               int num_atoms);
>  void gen4_init_atoms(struct brw_context *brw);
> +void gen45_init_atoms(struct brw_context *brw);
>  void gen5_init_atoms(struct brw_context *brw);
>  void gen6_init_atoms(struct brw_context *brw);
>  void gen7_init_atoms(struct brw_context *brw);
> -- 
> git-series 0.9.1
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev