diff options
| -rw-r--r-- | src/intel/compiler/brw_fs.cpp | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_generator.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 84becb3d4b4..bf301f4424b 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -2666,7 +2666,7 @@ fs_visitor::opt_sampler_eot() { brw_wm_prog_key *key = (brw_wm_prog_key*) this->key; - if (stage != MESA_SHADER_FRAGMENT) + if (stage != MESA_SHADER_FRAGMENT || dispatch_width > 16) return false; if (devinfo->gen != 9 && !devinfo->is_cherryview) diff --git a/src/intel/compiler/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp index 2265a60d1a6..0134afe0fe6 100644 --- a/src/intel/compiler/brw_fs_generator.cpp +++ b/src/intel/compiler/brw_fs_generator.cpp @@ -887,6 +887,11 @@ fs_generator::generate_tex(fs_inst *inst, struct brw_reg dst, struct brw_reg src uint32_t return_format; bool is_combined_send = inst->eot; + /* Sampler EOT message of less than the dispatch width would kill the + * thread prematurely. + */ + assert(!is_combined_send || inst->exec_size == dispatch_width); + switch (dst.type) { case BRW_REGISTER_TYPE_D: return_format = BRW_SAMPLER_RETURN_FORMAT_SINT32; |