From 915075bf66496a35f31b236206b6ac682baf752d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Mon, 3 Mar 2025 11:02:55 +0200 Subject: [PATCH] iris: remove dead code that cannot get hit anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of recent changes, MESA_SHADER_GEOMETRY is handled by the if ladder. CID: 1643918 Fixes: c33ebf09f5e ("iris: fix handling of GL_*_VERTEX_CONVENTION") Signed-off-by: Tapani Pälli Reviewed-by: Dylan Baker Part-of: (cherry picked from commit d0b8d7d46cebb7017cacdeb1a384a1e7826afe56) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_state.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d0abc17fd51..35789acc295 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -184,7 +184,7 @@ "description": "iris: remove dead code that cannot get hit anymore", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "c33ebf09f5e6638481b28db3ec3bb3f73d1537ea", "notes": null diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 970a63084c0..6e785e52249 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -7531,7 +7531,6 @@ iris_upload_dirty_render_state(struct iris_context *ice, MERGE_SCRATCH_ADDR(3DSTATE_DS); break; } - case MESA_SHADER_GEOMETRY: MERGE_SCRATCH_ADDR(3DSTATE_GS); break; } } else { iris_batch_emit(batch, shader->derived_data,