diff --git a/.pick_status.json b/.pick_status.json
index cb024654a3b..1d4a50c2b02 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4045,7 +4045,7 @@
         "description": "dxil: Use nir_const_value_for_uint in dxil_nir_lower_int_samplers",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b9c61379ab4c5065d624fb9403c1df9d5589b313"
     },
diff --git a/src/microsoft/compiler/dxil_nir_lower_int_samplers.c b/src/microsoft/compiler/dxil_nir_lower_int_samplers.c
index 2faae5a07d2..fe2d33689db 100644
--- a/src/microsoft/compiler/dxil_nir_lower_int_samplers.c
+++ b/src/microsoft/compiler/dxil_nir_lower_int_samplers.c
@@ -217,7 +217,6 @@ static nir_ssa_def *
 load_bordercolor(nir_builder *b, nir_tex_instr *tex, dxil_wrap_sampler_state *active_state,
                  const dxil_texture_swizzle_state *tex_swizzle)
 {
-   nir_const_value const_value[4] = {{0}};
    int ndest_comp = nir_dest_num_components(tex->dest);
 
    unsigned swizzle[4] = {
@@ -227,19 +226,25 @@ load_bordercolor(nir_builder *b, nir_tex_instr *tex, dxil_wrap_sampler_state *ac
       tex_swizzle->swizzle_a
    };
 
+   /* Avoid any possible float conversion issues */
+   uint32_t border_color[4];
+   memcpy(border_color, active_state->border_color, sizeof(border_color));
+   STATIC_ASSERT(sizeof(border_color) == sizeof(active_state->border_color));
+
+   nir_const_value const_value[4];
    for (int i = 0; i < ndest_comp; ++i) {
       switch (swizzle[i]) {
       case PIPE_SWIZZLE_0:
-         const_value[i].f32 = 0;
+         const_value[i] = nir_const_value_for_uint(0, 32);
          break;
       case PIPE_SWIZZLE_1:
-         const_value[i].i32 = 1;
+         const_value[i] = nir_const_value_for_uint(1, 32);
          break;
       case PIPE_SWIZZLE_X:
       case PIPE_SWIZZLE_Y:
       case PIPE_SWIZZLE_Z:
       case PIPE_SWIZZLE_W:
-         const_value[i].f32 = active_state->border_color[swizzle[i]];
+         const_value[i] = nir_const_value_for_uint(border_color[swizzle[i]], 32);
          break;
       default:
          unreachable("Unexpected swizzle value");