From 8c7c543936ab64f5470d2787022647dbab793773 Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Thu, 31 Jan 2019 13:18:19 -0800 Subject: [PATCH] isl: assert that Gen8+ don't have bit6_swizzling v2: Rewrite the condition to more clearly match the comment. (Jordan) Reviewed-by: Jordan Justen Reviewed-by: Jason Ekstrand --- src/intel/isl/isl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 7bb0fce3b60..eaaa28014a3 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -99,6 +99,9 @@ isl_device_init(struct isl_device *dev, const struct gen_device_info *info, bool has_bit6_swizzling) { + /* Gen8+ don't have bit6 swizzling, ensure callsite is not confused. */ + assert(!(has_bit6_swizzling && info->gen >= 8)); + dev->info = info; dev->use_separate_stencil = ISL_DEV_GEN(dev) >= 6; dev->has_bit6_swizzling = has_bit6_swizzling; -- 2.30.2