summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa@collabora.com>2021-12-13 15:18:56 -0500
committerMarge Bot <emma+marge@anholt.net>2021-12-20 18:21:40 +0000
commitd696183d4dc2ac695f74f802e03b893397e9567d (patch)
treebece64c0192b37bc04088babd76294c61a9325e4
parente9b509755b4e1621274ff80117ad9858795579d4 (diff)
pan/indirect_draw: Don't upload garbage UBO
There should never be a CPU pointer in GPU memory, let's say that... Fixes: 2e6d94c198e ("panfrost: Add helpers to support indirect draws") Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14154>
-rw-r--r--src/panfrost/lib/pan_indirect_draw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/panfrost/lib/pan_indirect_draw.c b/src/panfrost/lib/pan_indirect_draw.c
index f2b73fb5c191..06c7183936bf 100644
--- a/src/panfrost/lib/pan_indirect_draw.c
+++ b/src/panfrost/lib/pan_indirect_draw.c
@@ -1171,15 +1171,15 @@ get_ubos(struct pan_pool *pool,
const struct indirect_draw_inputs *inputs)
{
struct panfrost_ptr inputs_buf =
- pan_pool_alloc_aligned(pool, sizeof(inputs), 16);
+ pan_pool_alloc_aligned(pool, sizeof(*inputs), 16);
- memcpy(inputs_buf.cpu, &inputs, sizeof(inputs));
+ memcpy(inputs_buf.cpu, inputs, sizeof(*inputs));
struct panfrost_ptr ubos_buf =
pan_pool_alloc_desc(pool, UNIFORM_BUFFER);
pan_pack(ubos_buf.cpu, UNIFORM_BUFFER, cfg) {
- cfg.entries = DIV_ROUND_UP(sizeof(inputs), 16);
+ cfg.entries = DIV_ROUND_UP(sizeof(*inputs), 16);
cfg.pointer = inputs_buf.gpu;
}