From 9a2573e5fc63f48cde56efdb191c129e7d7fb7b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg=20Kristensen?= Date: Wed, 7 Oct 2015 05:13:50 -0700 Subject: [PATCH] i965/cs: Get max_cs_threads from brw_compiler devinfo MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Jason Ekstrand Signed-off-by: Kristian Høgsberg Kristensen --- src/mesa/drivers/dri/i965/brw_fs.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index f1282a0948f..ba62fdd4b86 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -5277,6 +5277,7 @@ brw_cs_emit(struct brw_context *brw, prog_data->local_size[2] = cp->LocalSize[2]; unsigned local_workgroup_size = cp->LocalSize[0] * cp->LocalSize[1] * cp->LocalSize[2]; + unsigned max_cs_threads = brw->intelScreen->compiler->devinfo->max_cs_threads; cfg_t *cfg = NULL; const char *fail_msg = NULL; @@ -5287,7 +5288,7 @@ brw_cs_emit(struct brw_context *brw, &prog_data->base, &cp->Base, cp->Base.nir, 8, shader_time_index); if (!v8.run_cs()) { fail_msg = v8.fail_msg; - } else if (local_workgroup_size <= 8 * brw->max_cs_threads) { + } else if (local_workgroup_size <= 8 * max_cs_threads) { cfg = v8.cfg; prog_data->simd_size = 8; } @@ -5296,7 +5297,7 @@ brw_cs_emit(struct brw_context *brw, &prog_data->base, &cp->Base, cp->Base.nir, 16, shader_time_index); if (likely(!(INTEL_DEBUG & DEBUG_NO16)) && !fail_msg && !v8.simd16_unsupported && - local_workgroup_size <= 16 * brw->max_cs_threads) { + local_workgroup_size <= 16 * max_cs_threads) { /* Try a SIMD16 compile */ v16.import_uniforms(&v8); if (!v16.run_cs()) { -- 2.30.2