Mesa (master): i965/cs: Return 1 for regs_read on CS_OPCODE_CS_TERMINATE

Jordan Justen jljusten at kemper.freedesktop.org
Fri Jul 17 04:38:25 UTC 2015


Module: Mesa
Branch: master
Commit: 7e337859ff98a0caf00fd201a5389933d42d0baa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e337859ff98a0caf00fd201a5389933d42d0baa

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Thu Jul 16 15:04:43 2015 -0700

i965/cs: Return 1 for regs_read on CS_OPCODE_CS_TERMINATE

This prevents an assertion failure in brw_fs_live_variables.cpp,
fs_live_variables::setup_one_read: Assertion `var < num_vars' failed.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

---

 src/mesa/drivers/dri/i965/brw_fs.cpp |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index ff0675d..2e3eb05 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -698,6 +698,9 @@ fs_inst::regs_read(int arg) const
          return 1;
       break;
 
+   case CS_OPCODE_CS_TERMINATE:
+      return 1;
+
    default:
       if (is_tex() && arg == 0 && src[0].file == GRF)
          return mlen;




More information about the mesa-commit mailing list