From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 17 May 2016 01:18:43 +0000 (-0700)
Subject: i965/fs: Return 32 bit mask from fs_builder::sample_mask().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae730049c67cb882c3f936ba6a2c3b1449c45f5e;p=mesa.git

i965/fs: Return 32 bit mask from fs_builder::sample_mask().

This doesn't actually handle the FS case, just add an assertion for
the moment so I don't forget to update it later on for SIMD32 fragment
shader dispatch.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_builder.h b/src/mesa/drivers/dri/i965/brw_fs_builder.h
index f38be6cdf4c..f22903e5234 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_builder.h
+++ b/src/mesa/drivers/dri/i965/brw_fs_builder.h
@@ -236,8 +236,10 @@ namespace brw {
       src_reg
       sample_mask_reg() const
       {
+         assert(shader->stage != MESA_SHADER_FRAGMENT ||
+                group() + dispatch_width() <= 16);
          if (shader->stage != MESA_SHADER_FRAGMENT) {
-            return brw_imm_d(0xffff);
+            return brw_imm_d(0xffffffff);
          } else if (((brw_wm_prog_data *)shader->stage_prog_data)->uses_kill) {
             return brw_flag_reg(0, 1);
          } else {