diff --git a/.pick_status.json b/.pick_status.json
index 0bec362a944..6a7cdfd844f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2484,7 +2484,7 @@
         "description": "mesa: get correct src address for transferOps",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "4b249d2eed686384d6d7c36f3232360891d5eeda",
         "notes": null
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index d5b8dbf7e56..d2f2d93579d 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -776,7 +776,9 @@ texstore_rgba(TEXSTORE_PARAMS)
       }
 
       /* Convert from src to RGBA float */
-      src = (GLubyte *) srcAddr;
+      src = (GLubyte *)
+         _mesa_image_address(dims, srcPacking, srcAddr, srcWidth, srcHeight,
+                             srcFormat, srcType, 0, 0, 0);
       dst = (GLubyte *) tempRGBA;
       for (img = 0; img < srcDepth; img++) {
          _mesa_format_convert(dst, RGBA32_FLOAT, 4 * srcWidth * sizeof(float),