summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2015-08-05 16:29:30 +0300
committerEmil Velikov <emil.l.velikov@gmail.com>2015-08-06 19:04:59 +0100
commit736f6e16d9989f01cc55dcba15ba978ba90b7748 (patch)
treef2f79ad82a9b338c70bfd65c1845d6441af8fd60
parentf13ba8a5ab537e6dcdcc8b0c1a814012202d2497 (diff)
i965/fs: Fix fs_inst::regs_read() for sources in the ATTR file.
Otherwise it would crash on Gen8 with scalar VS. The issue can easily be reproduced with the following patch, but I don't see any reason why it wouldn't be possible to end up with an ATTR argument here even without it. CC: mesa-stable@lists.freedesktop.org Reviewed-by: Connor Abbott <connor.w.abbott@intel.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (cherry picked from commit 42a18ca76057621ae7d8812b29ea2245d6ff282d)
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 502ca5543e5..d99c79bfdf4 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -973,6 +973,7 @@ fs_inst::regs_read(int arg) const
case IMM:
return 1;
case GRF:
+ case ATTR:
case HW_REG:
if (src[arg].stride == 0) {
return 1;