From fd2038b22ad281fa5020aca8961e130747e365a4 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 10 Dec 2018 22:03:14 -0800 Subject: [PATCH] iris: Set program key fields for MCS --- src/gallium/drivers/iris/iris_program.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index eb341e94fdd..f069f366989 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -42,8 +42,11 @@ #include "intel/compiler/brw_nir.h" #include "iris_context.h" -#define ALL_SAMPLERS_XYZW .tex.swizzles[0 ... MAX_SAMPLERS - 1] = 0x688 -#define KEY_INIT .program_string_id = ish->program_id, ALL_SAMPLERS_XYZW +#define KEY_INIT_NO_ID \ + .tex.swizzles[0 ... MAX_SAMPLERS - 1] = 0x688, \ + .tex.compressed_multisample_layout_mask = ~0, \ + .tex.msaa_16 = ~0 +#define KEY_INIT .program_string_id = ish->program_id, KEY_INIT_NO_ID static unsigned get_new_program_id(struct iris_screen *screen) @@ -742,7 +745,7 @@ iris_update_compiled_tcs(struct iris_context *ice) const struct shader_info *tes_info = iris_get_shader_info(ice, MESA_SHADER_TESS_EVAL); struct brw_tcs_prog_key key = { - ALL_SAMPLERS_XYZW, + KEY_INIT_NO_ID, .program_string_id = tcs ? tcs->program_id : 0, .tes_primitive_mode = tes_info->tess.primitive_mode, .input_vertices = ice->state.vertices_per_patch, -- 2.30.2