diff options
| author | Gert Wollny <gert.wollny@collabora.com> | 2019-05-13 14:02:24 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-17 15:19:10 -0700 |
| commit | 2274d43fa62a93efdb057ea224ad606d5e145516 (patch) | |
| tree | 27c75943b228f5a9df7c650bfbec31a803c1d0bd | |
| parent | 5cac14f77a00ae735af0f5217467d1e362d88544 (diff) | |
softpipe/buffer: load only as many components as the the buffer resource type provides
Otherwise we risk to read past the end of the buffer.
In addition, change the loop counters to unsigned to be consistent
with the types.
Fixes: afa8707ba93a7d226a76319acda2a8dd89524db7
softpipe: add SSBO/shader atomics support.
Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 865b9ddae4874186182e529b5fd154ab04a61f79)
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_buffer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_buffer.c b/src/gallium/drivers/softpipe/sp_buffer.c index e91d2af78e9..b8bc5007fac 100644 --- a/src/gallium/drivers/softpipe/sp_buffer.c +++ b/src/gallium/drivers/softpipe/sp_buffer.c @@ -55,7 +55,8 @@ sp_tgsi_load(const struct tgsi_buffer *buffer, struct pipe_shader_buffer *bview; struct softpipe_resource *spr; unsigned width; - int c, j; + unsigned ncomp; + unsigned c, j; unsigned char *data_ptr; const struct util_format_description *format_desc = util_format_description(PIPE_FORMAT_R32_UINT); @@ -63,6 +64,8 @@ sp_tgsi_load(const struct tgsi_buffer *buffer, goto fail_write_all_zero; bview = &sp_buf->sp_bview[params->unit]; + ncomp = util_format_get_nr_components(bview->buffer->format); + spr = softpipe_resource(bview->buffer); if (!spr) goto fail_write_all_zero; @@ -88,7 +91,7 @@ sp_tgsi_load(const struct tgsi_buffer *buffer, continue; } data_ptr = (unsigned char *)spr->data + bview->buffer_offset + s_coord; - for (c = 0; c < 4; c++) { + for (c = 0; c < ncomp; c++) { format_desc->fetch_rgba_uint(sdata, data_ptr, 0, 0); ((uint32_t *)rgba[c])[j] = sdata[0]; data_ptr += 4; |