From 78fc760babe08898746dfde1b5e424a4a4c199fd Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 9 Nov 2018 01:35:14 -0800 Subject: [PATCH] iris: dodge backend UCP lowering --- src/gallium/drivers/iris/iris_program.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 79086e60993..f59bd06d91d 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -570,9 +570,15 @@ iris_compile_vs(struct iris_context *ice, &vue_prog_data->vue_map, nir->info.outputs_written, nir->info.separate_shader); + /* Don't tell the backend about our clip plane constants, we've already + * lowered them in NIR and we don't want it doing it again. + */ + struct brw_vs_prog_key key_no_ucp = *key; + key_no_ucp.nr_userclip_plane_consts = 0; + char *error_str = NULL; const unsigned *program = - brw_compile_vs(compiler, &ice->dbg, mem_ctx, key, vs_prog_data, + brw_compile_vs(compiler, &ice->dbg, mem_ctx, &key_no_ucp, vs_prog_data, nir, -1, &error_str); if (program == NULL) { dbg_printf("Failed to compile vertex shader: %s\n", error_str); -- 2.30.2