From 6d63fd8a69fa28e6740bb56751459bbaac11a462 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Wed, 16 Aug 2017 16:45:47 -0700 Subject: [PATCH] intel/isl: Build gen12 using gen11 code paths Signed-off-by: Jordan Justen Reviewed-by: Kenneth Graunke Reviewed-by: Lionel Landwerlin --- src/intel/Makefile.sources | 4 ++++ src/intel/isl/isl.c | 3 +++ src/intel/isl/isl_priv.h | 3 +++ src/intel/isl/meson.build | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 79f86a5..4393781 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -219,6 +219,10 @@ ISL_GEN11_FILES = \ isl/isl_emit_depth_stencil.c \ isl/isl_surface_state.c +ISL_GEN12_FILES = \ + isl/isl_emit_depth_stencil.c \ + isl/isl_surface_state.c + ISL_GENERATED_FILES = \ isl/isl_format_layout.c diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 1b033cb..a647bf0 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -1900,6 +1900,9 @@ isl_surf_get_ccs_surf(const struct isl_device *dev, case 11: \ isl_gen11_##func(__VA_ARGS__); \ break; \ + case 12: \ + isl_gen12_##func(__VA_ARGS__); \ + break; \ default: \ assert(!"Unknown hardware generation"); \ } diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h index 993ae13..710c522 100644 --- a/src/intel/isl/isl_priv.h +++ b/src/intel/isl/isl_priv.h @@ -232,6 +232,9 @@ _isl_memcpy_tiled_to_linear_sse41(uint32_t xt1, uint32_t xt2, # define genX(x) gen11_##x # include "isl_genX_priv.h" # undef genX +# define genX(x) gen12_##x +# include "isl_genX_priv.h" +# undef genX #endif #endif /* ISL_PRIV_H */ diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 8807074..2e0f65c 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -51,7 +51,7 @@ isl_gen9_files = files( isl_gen_libs = [] foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files], ['70', isl_gen7_files], ['75', []], ['80', isl_gen8_files], - ['90', isl_gen9_files], ['100', []], ['110', []]] + ['90', isl_gen9_files], ['100', []], ['110', []], ['120', []]] _gen = g[0] isl_gen_libs += static_library( 'isl_gen@0@'.format(_gen), -- 2.7.4