diff --git a/.pick_status.json b/.pick_status.json index 87cccccf56fc..13ae7c0af84f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -10624,7 +10624,7 @@ "description": "iris: Check prog[] instead of uncompiled[] for BLORP state skipping", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c index 902fabe03033..2cc6ba34ea19 100644 --- a/src/gallium/drivers/iris/iris_blorp.c +++ b/src/gallium/drivers/iris/iris_blorp.c @@ -364,8 +364,8 @@ iris_blorp_exec_render(struct blorp_batch *blorp_batch, IRIS_STAGE_DIRTY_SAMPLER_STATES_TES | IRIS_STAGE_DIRTY_SAMPLER_STATES_GS); - if (!ice->shaders.uncompiled[MESA_SHADER_TESS_EVAL]) { - /* BLORP disabled tessellation, that's fine for the next draw */ + if (!ice->shaders.prog[MESA_SHADER_TESS_EVAL]) { + /* BLORP disabled tessellation, but it was already off anyway */ skip_stage_bits |= IRIS_STAGE_DIRTY_TCS | IRIS_STAGE_DIRTY_TES | IRIS_STAGE_DIRTY_CONSTANTS_TCS | @@ -374,8 +374,8 @@ iris_blorp_exec_render(struct blorp_batch *blorp_batch, IRIS_STAGE_DIRTY_BINDINGS_TES; } - if (!ice->shaders.uncompiled[MESA_SHADER_GEOMETRY]) { - /* BLORP disabled geometry shaders, that's fine for the next draw */ + if (!ice->shaders.prog[MESA_SHADER_GEOMETRY]) { + /* BLORP disabled geometry shaders, but it was already off anyway */ skip_stage_bits |= IRIS_STAGE_DIRTY_GS | IRIS_STAGE_DIRTY_CONSTANTS_GS | IRIS_STAGE_DIRTY_BINDINGS_GS;