u_upload_mgr: pass alignment to u_upload_alloc manually

[mesa.git] / src / gallium / auxiliary / util / u_upload_mgr.c

diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c b/src/gallium/auxiliary/util/u_upload_mgr.c
index 4148bae5ab5046849ae64011364126e7c0666f93..3f790400e4067e3933a890712d241bc4abfe2316 100644 (file)
--- a/src/gallium/auxiliary/util/u_upload_mgr.c
+++ b/src/gallium/auxiliary/util/u_upload_mgr.c
@@ -181,11 +181,11 @@ void
 u_upload_alloc(struct u_upload_mgr *upload,
                unsigned min_out_offset,
                unsigned size,
+               unsigned alignment,
                unsigned *out_offset,
                struct pipe_resource **outbuf,
                void **ptr)
 {
-   unsigned alignment = upload->alignment;
    unsigned buffer_size = upload->buffer ? upload->buffer->width0 : 0;
    unsigned offset;
 
@@ -249,7 +249,7 @@ void u_upload_data(struct u_upload_mgr *upload,
 {
    uint8_t *ptr;
 
-   u_upload_alloc(upload, min_out_offset, size,
+   u_upload_alloc(upload, min_out_offset, size, upload->alignment,
                   out_offset, outbuf,
                   (void**)&ptr);
    if (ptr)