From f1b7c47913344338a8730cf3561ce95527b53c4c Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Thu, 22 Jun 2017 16:42:34 -0700 Subject: [PATCH] i965/fs: Handle explicit flag sources in flags_read() The implementations of the ARB_shader_ballot intrinsics will explicitly read the flag as a source register. Reviewed-by: Matt Turner --- src/intel/compiler/brw_fs.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index f3bb3835d9b..38b5e52dc47 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -880,9 +880,6 @@ namespace { unsigned fs_inst::flags_read(const gen_device_info *devinfo) const { - /* XXX - This doesn't consider explicit uses of the flag register as source - * region. - */ if (predicate == BRW_PREDICATE_ALIGN1_ANYV || predicate == BRW_PREDICATE_ALIGN1_ALLV) { /* The vertical predication modes combine corresponding bits from @@ -893,7 +890,11 @@ fs_inst::flags_read(const gen_device_info *devinfo) const } else if (predicate) { return flag_mask(this); } else { - return 0; + unsigned mask = 0; + for (int i = 0; i < sources; i++) { + mask |= flag_mask(src[i], size_read(i)); + } + return mask; } } -- 2.30.2