diff options
author | Nicolai Hähnle <[email protected]> | 2019-05-13 16:58:08 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2019-06-12 18:30:25 -0400 |
commit | de8a919702a377207e83434ab40d91c3013ed96c (patch) | |
tree | ba800d0375de39a447a6690b448ae52807ab01f3 /src/gallium/drivers/nouveau/nv30 | |
parent | 71b45bae14be84ab09212c9ded758fa31e31e945 (diff) |
u_dynarray: turn util_dynarray_{grow, resize} into element-oriented macros
The main motivation for this change is API ergonomics: most operations
on dynarrays are really on elements, not on bytes, so it's weird to have
grow and resize as the odd operations out.
The secondary motivation is memory safety. Users of the old byte-oriented
functions would often multiply a number of elements with the element size,
which could overflow, and checking for overflow is tedious.
With this change, we only need to implement the overflow checks once.
The checks are cheap: since eltsize is a compile-time constant and the
functions should be inlined, they only add a single comparison and an
unlikely branch.
v2:
- ensure operations are no-op when allocation fails
- in util_dynarray_clone, call resize_bytes with a compile-time constant element size
v3:
- fix iris, lima, panfrost
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau/nv30')
-rw-r--r-- | src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c index 86e3599325e..2bcb62b97d8 100644 --- a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c +++ b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c @@ -73,7 +73,7 @@ nvfx_fp_imm(struct nvfx_fpc *fpc, float a, float b, float c, float d) float v[4] = {a, b, c, d}; int idx = fpc->imm_data.size >> 4; - memcpy(util_dynarray_grow(&fpc->imm_data, sizeof(float) * 4), v, 4 * sizeof(float)); + memcpy(util_dynarray_grow(&fpc->imm_data, float, 4), v, 4 * sizeof(float)); return nvfx_reg(NVFXSR_IMM, idx); } |