iris: dodge backend UCP lowering

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index 79086e609937293afbfcdffebfa68bba7d862fc3..f59bd06d91debfd2868d5793319d13bb31cb7c54 100644 (file)
--- 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);