Revert "utils/upload: fix use of formats with unusual sample order"

This was incomplete fix and only worked for uploading case. Better fix
to follow in next commit.

This reverts commit a018ab04.

src/utils/upload.c

@@ -206,7 +206,7 @@ pl_fmt pl_plane_find_fmt(pl_gpu gpu, int out_map[4], const struct pl_plane_data
             int size = data->component_size[i];
             if (size && (idx >= 4 || fmt->host_bits[idx] != size))
                 goto next_fmt;
-            out_map[fmt->sample_order[idx++]] = data->component_map[i];
+            out_map[idx++] = data->component_map[i];
         }
 
         // Reject misaligned formats, check this last to only log such errors