From 3ea69bf0fe712b1f7379d07d923f5a955b14715f Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 19 Aug 2023 02:30:30 +0100 Subject: [PATCH] vc4: drop duplicate .lower_ldexp It's set 3 lines above already. Fixes: 2a33ea95d66cd7ba83e2 ("glsl: Retire ldexp lowering in favor of the nir lowering flag.") Signed-off-by: Eric Engestrom Part-of: (cherry picked from commit af28356de06d7b5adfa3fa87dac157021c3a68a9) --- .pick_status.json | 2 +- src/gallium/drivers/vc4/vc4_program.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a05b41df947..64be3299a9c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5634,7 +5634,7 @@ "description": "vc4: drop duplicate .lower_ldexp", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2a33ea95d66cd7ba83e2774f5559bf781da66c40", "notes": null diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index 03a5d656933..37cfb8115c2 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -2175,7 +2175,6 @@ static const nir_shader_compiler_options nir_options = { .lower_ldexp = true, .lower_fneg = true, .lower_ineg = true, - .lower_ldexp = true, .lower_rotate = true, .lower_to_scalar = true, .lower_umax = true,