diff --git a/.pick_status.json b/.pick_status.json
index 313c07516fe..928431a0970 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1687,7 +1687,7 @@
         "description": "frontend/nine: Fix num_textures count",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/nine/nine_state.c b/src/gallium/frontends/nine/nine_state.c
index cd627c83d1e..84e73770d87 100644
--- a/src/gallium/frontends/nine/nine_state.c
+++ b/src/gallium/frontends/nine/nine_state.c
@@ -999,7 +999,7 @@ update_textures_and_samplers(struct NineDevice9 *device)
     commit_samplers = FALSE;
     const uint16_t ps_mask = sampler_mask | context->enabled_samplers_mask_ps;
     context->bound_samplers_mask_ps = ps_mask;
-    num_textures = util_last_bit(ps_mask) + 1;
+    num_textures = util_last_bit(ps_mask);
     /* iterate over the enabled samplers */
     u_foreach_bit(i, context->enabled_samplers_mask_ps) {
         const unsigned s = NINE_SAMPLER_PS(i);
@@ -1046,7 +1046,7 @@ update_textures_and_samplers(struct NineDevice9 *device)
     sampler_mask = context->programmable_vs ? context->vs->sampler_mask : 0;
     const uint16_t vs_mask = sampler_mask | context->enabled_samplers_mask_vs;
     context->bound_samplers_mask_vs = vs_mask;
-    num_textures = util_last_bit(vs_mask) + 1;
+    num_textures = util_last_bit(vs_mask);
     u_foreach_bit(i, context->enabled_samplers_mask_vs) {
         const unsigned s = NINE_SAMPLER_VS(i);
         int sRGB = context->samp[s][D3DSAMP_SRGBTEXTURE] ? 1 : 0;