diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-06-02 19:00:10 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-06-22 12:26:43 -0700 |
| commit | 62a5e6e03117e5eb3f777633409cb8036be6877d (patch) | |
| tree | 2d46778c1566167c23ce61a2bc76bd75d530156e | |
| parent | b1b0d6fb5415c874cbbd1346e50d04e33b0e9c21 (diff) | |
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 <chad.versace@intel.com>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
| -rw-r--r-- | src/intel/isl/isl_surface_state.c | 14 |
1 files 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, |