summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/iris
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2018-12-10 22:03:14 -0800
committerKenneth Graunke <[email protected]>2019-02-21 10:26:12 -0800
commitfd2038b22ad281fa5020aca8961e130747e365a4 (patch)
tree18b5f21a975a7b3b0812b1e6e89c2a4ab598bbc4 /src/gallium/drivers/iris
parent92c310fd3f71e55c231fd9139e5db1be3c3dc51c (diff)
iris: Set program key fields for MCS
Diffstat (limited to 'src/gallium/drivers/iris')
-rw-r--r--src/gallium/drivers/iris/iris_program.c9
1 files 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,