From: Francisco Jerez <currojerez@riseup.net>
Date: Mon, 13 Jul 2015 12:33:04 +0000 (+0300)
Subject: i965/fs: Fix opt_zero_samples() for texturing ops not matching dispatch_width.
X-Git-Tag: upstream/17.1.0~17334
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44a8cf488e0370d7e5abe363c1fd2d21247a6e32;p=platform%2Fupstream%2Fmesa.git

i965/fs: Fix opt_zero_samples() for texturing ops not matching dispatch_width.

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index d9096f1..5ca476d 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -2162,11 +2162,11 @@ fs_visitor::opt_zero_samples()
        *     "Parameter 0 is required except for the sampleinfo message, which
        *      has no parameter 0"
        */
-      while (inst->mlen > inst->header_size + dispatch_width / 8 &&
+      while (inst->mlen > inst->header_size + inst->exec_size / 8 &&
              load_payload->src[(inst->mlen - inst->header_size) /
-                               (dispatch_width / 8) +
+                               (inst->exec_size / 8) +
                                inst->header_size - 1].is_zero()) {
-         inst->mlen -= dispatch_width / 8;
+         inst->mlen -= inst->exec_size / 8;
          progress = true;
       }
    }