diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-12-19 17:15:02 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-01-02 15:15:44 +0100 |
| commit | 1bb79c3a7bee7298b0415ee21a9412c98b1cfee5 (patch) | |
| tree | 115d40c6e16f8397406a400b660750f9dd1e2885 | |
| parent | e0f932846c91e6eca6495c86b72e87af64dfefb5 (diff) | |
| download | external_mesa3d-1bb79c3a7bee7298b0415ee21a9412c98b1cfee5.zip external_mesa3d-1bb79c3a7bee7298b0415ee21a9412c98b1cfee5.tar.gz external_mesa3d-1bb79c3a7bee7298b0415ee21a9412c98b1cfee5.tar.bz2 | |
u_upload_mgr: pass alignment to u_upload_buffer manually
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
| -rw-r--r-- | src/gallium/auxiliary/util/u_upload_mgr.c | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_upload_mgr.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_state.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c b/src/gallium/auxiliary/util/u_upload_mgr.c index 646965c..3c8d5c9 100644 --- a/src/gallium/auxiliary/util/u_upload_mgr.c +++ b/src/gallium/auxiliary/util/u_upload_mgr.c @@ -262,6 +262,7 @@ void u_upload_buffer(struct u_upload_mgr *upload, unsigned min_out_offset, unsigned offset, unsigned size, + unsigned alignment, struct pipe_resource *inbuf, unsigned *out_offset, struct pipe_resource **outbuf) @@ -283,7 +284,7 @@ void u_upload_buffer(struct u_upload_mgr *upload, if (0) debug_printf("upload ptr %p ofs %d sz %d\n", map, offset, size); - u_upload_data(upload, min_out_offset, size, upload->alignment, + u_upload_data(upload, min_out_offset, size, alignment, map, out_offset, outbuf); pipe_buffer_unmap( upload->pipe, transfer ); } diff --git a/src/gallium/auxiliary/util/u_upload_mgr.h b/src/gallium/auxiliary/util/u_upload_mgr.h index 4662458..e9fe5fa 100644 --- a/src/gallium/auxiliary/util/u_upload_mgr.h +++ b/src/gallium/auxiliary/util/u_upload_mgr.h @@ -113,6 +113,7 @@ void u_upload_buffer(struct u_upload_mgr *upload, unsigned min_out_offset, unsigned offset, unsigned size, + unsigned alignment, struct pipe_resource *inbuf, unsigned *out_offset, struct pipe_resource **outbuf); diff --git a/src/gallium/drivers/ilo/ilo_state.c b/src/gallium/drivers/ilo/ilo_state.c index 0232713..8dc2d38 100644 --- a/src/gallium/drivers/ilo/ilo_state.c +++ b/src/gallium/drivers/ilo/ilo_state.c @@ -431,7 +431,7 @@ finalize_index_buffer(struct ilo_context *ilo) &hw_offset, &vec->ib.hw_resource); } else { u_upload_buffer(ilo->uploader, 0, - vec->ib.state.offset + offset, size, vec->ib.state.buffer, + vec->ib.state.offset + offset, size, 16, vec->ib.state.buffer, &hw_offset, &vec->ib.hw_resource); } |