diff --git a/.pick_status.json b/.pick_status.json
index bda64282ee1..471691be61b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -8154,7 +8154,7 @@
         "description": "mesa: clamp fog scale to -FLT_MAX instead of FLT_MIN",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "35ae5dce39cddb71f217b3f73c8e1244ff0c5b1e",
         "notes": null
diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt
index f4ea140ced9..88013bfa380 100644
--- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt
+++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt
@@ -409,9 +409,5 @@ spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Fail
 spec@nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Fail
 wgl@wgl-multi-context-single-window,Fail
 
-# Should've been fixed by https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/843
-# but still seems to be failing.
-spec@arb_vertex_program@arb_vertex_program-property-bindings,Fail
-
 # This tests NaNs in a GLSL version where NaNs are undefined
 shaders@glsl-fs-fogscale@vs and fs,Fail
diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt
index d096a8ed15a..4a3b0c703bd 100644
--- a/src/gallium/drivers/lima/ci/lima-fails.txt
+++ b/src/gallium/drivers/lima/ci/lima-fails.txt
@@ -584,10 +584,6 @@ spec@!opengl 1.1@line-smooth-stipple,Fail
 # bookworm update
 spec@ext_framebuffer_multisample@renderbufferstorage-samples,Fail
 
-# remove this after https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/843
-# is merged and piglit is updated
-spec@glsl-1.10@execution@glsl-1.10-built-in-uniform-state,Fail
-
 x11-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_srgb,Fail
 x11-dEQP-EGL.functional.wide_color.window_888_colorspace_srgb,Fail
 
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index cd6cafe6d49..6f0288df1ea 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -317,7 +317,7 @@ fetch_state(struct gl_context *ctx, const gl_state_index16 state[],
        * The division by 2 makes it less likely that ALU ops will generate
        * Inf.
        */
-      scale = CLAMP(scale, FLT_MIN / 2, FLT_MAX / 2);
+      scale = CLAMP(scale, -FLT_MAX / 2, FLT_MAX / 2);
       value[0] = ctx->Fog.Density;
       value[1] = ctx->Fog.Start;
       value[2] = ctx->Fog.End;