diff --git a/.pick_status.json b/.pick_status.json
index 55021fa1c42..6cef2836a84 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1234,7 +1234,7 @@
         "description": "gallivm/sample: fix sampling indirect from vertex shaders",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
index 4887a58cda2..bc70ce1c42a 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
@@ -3379,7 +3379,7 @@ lp_build_sample_soa_code(struct gallivm_state *gallivm,
 
    const enum pipe_texture_target target = static_texture_state->target;
    const unsigned dims = texture_dims(target);
-   const unsigned num_quads = type.length / 4;
+   const unsigned num_quads = type.length == 1 ? 1 : type.length / 4;
    struct lp_build_sample_context bld;
    struct lp_static_sampler_state derived_sampler_state = *static_sampler_state;
    LLVMTypeRef i32t = LLVMInt32TypeInContext(gallivm->context);