From 2155cd545c1853564bb8e5f08aa64eb269df2d1e Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Thu, 3 Oct 2024 01:14:00 +0200 Subject: [PATCH] etnaviv: re-emit uniforms on sampler view changes when txs is used The shader uniforms used for emulating TXS depend on the current sampler view state and thus need to be re-emitted when this states changes. Fixes: 88f399b65157 ("etnaviv: nir: support intrinsic used for txs lowering") Signed-off-by: Lucas Stach Reviewed-by: Christian Gmeiner Part-of: (cherry picked from commit c12697abe0cb6aac45aeac3ebb9e55f64cfc9f37) --- .pick_status.json | 2 +- src/gallium/drivers/etnaviv/etnaviv_uniforms.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index a57d6b70ffc..8f7bcd4f66d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2244,7 +2244,7 @@ "description": "etnaviv: re-emit uniforms on sampler view changes when txs is used", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "88f399b6515787adbe6e396df85fb5659797cb00", "notes": null diff --git a/src/gallium/drivers/etnaviv/etnaviv_uniforms.c b/src/gallium/drivers/etnaviv/etnaviv_uniforms.c index 2e1cc4469f7..d71fae8d378 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_uniforms.c +++ b/src/gallium/drivers/etnaviv/etnaviv_uniforms.c @@ -182,6 +182,9 @@ etna_set_shader_uniforms_dirty_flags(struct etna_shader_variant *sobj) case ETNA_UNIFORM_TEXRECT_SCALE_X: case ETNA_UNIFORM_TEXRECT_SCALE_Y: + case ETNA_UNIFORM_TEXTURE_WIDTH: + case ETNA_UNIFORM_TEXTURE_HEIGHT: + case ETNA_UNIFORM_TEXTURE_DEPTH: dirty |= ETNA_DIRTY_SAMPLER_VIEWS; break; }