From 62a5e6e03117e5eb3f777633409cb8036be6877d Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 2 Jun 2016 19:00:10 -0700 Subject: [PATCH] isl/state: Refactor the per-gen isl_to_gen_h/valign tables This moves the #if's around so that halign and valign have different sets of #if conditions. This also prepares us for SNB because isl_to_gen_halign is not defined at all on gen6. Reviewed-by: Chad Versace Cc: "12.0" --- src/intel/isl/isl_surface_state.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index 49baec95974..745fea89d00 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -47,18 +47,20 @@ static const uint8_t isl_to_gen_halign[] = { [8] = HALIGN8, [16] = HALIGN16, }; +#elif GEN_GEN >= 7 +static const uint8_t isl_to_gen_halign[] = { + [4] = HALIGN_4, + [8] = HALIGN_8, +}; +#endif +#if GEN_GEN >= 8 static const uint8_t isl_to_gen_valign[] = { [4] = VALIGN4, [8] = VALIGN8, [16] = VALIGN16, }; -#else -static const uint8_t isl_to_gen_halign[] = { - [4] = HALIGN_4, - [8] = HALIGN_8, -}; - +#elif GEN_GEN >= 6 static const uint8_t isl_to_gen_valign[] = { [2] = VALIGN_2, [4] = VALIGN_4, -- 2.11.0