diff --git a/.pick_status.json b/.pick_status.json
index ef51f7a12db..11a81d47eae 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1804,7 +1804,7 @@
         "description": "mesa: use default params for clearbuffer functions",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 6ef81bcbd14..1ebbbff86da 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -995,10 +995,11 @@ convert_clear_buffer_data(struct gl_context *ctx,
                           const GLvoid *data, const char *caller)
 {
    GLenum internalformatBase = _mesa_get_format_base_format(internalformat);
+   struct gl_pixelstore_attrib packing = {.Alignment = 1};
 
    if (_mesa_texstore(ctx, 1, internalformatBase, internalformat,
                       0, &clearValue, 1, 1, 1,
-                      format, type, data, &ctx->Unpack)) {
+                      format, type, data, &packing)) {
       return true;
    }
    else {