From 11faa02ec45603e5fea0768d55bfde4cfe481f44 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 24 Feb 2025 10:12:17 -0800 Subject: [PATCH] iris: Correctly set NOS for geometry shader state changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Tapani Pälli Backport-to: 25.0 Part-of: (cherry picked from commit 0477ee660f20964d5550dbcb147fc5899bef229f) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_program.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cb785e024c9..e99db4d6111 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1474,7 +1474,7 @@ "description": "iris: Correctly set NOS for geometry shader state changes", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 71762b82d98..0b805583caf 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -3496,9 +3496,7 @@ iris_create_shader_state(struct pipe_context *ctx, break; case MESA_SHADER_GEOMETRY: - /* User clip planes */ - if (info->clip_distance_array_size == 0) - ish->nos |= (1ull << IRIS_NOS_RASTERIZER); + ish->nos |= (1ull << IRIS_NOS_RASTERIZER); key.gs = (struct iris_gs_prog_key) { KEY_INIT(vue.base) }; key_size = sizeof(key.gs);