Module: Mesa Branch: staging/21.0 Commit: e3167e7dba80cf174117aa38d7fad04777689fd0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3167e7dba80cf174117aa38d7fad04777689fd0
Author: Karol Herbst <[email protected]> Date: Thu Mar 4 20:32:10 2021 +0100 tegra/context: fix regression in tegra_draw_vbo We should only pass in a new indirect_info object if we actually set valid values in it. Fixes: abe8ef862fe5 "gallium: make pipe_draw_indirect_info * a draw_vbo parameter" Signed-off-by: Karol Herbst <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9425> (cherry picked from commit a84c8ddb19beef7580d6a4b8c417bb188517412a) --- .pick_status.json | 2 +- src/gallium/drivers/tegra/tegra_context.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 764af40eb22..2053726c6a8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1129,7 +1129,7 @@ "description": "tegra/context: fix regression in tegra_draw_vbo", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "abe8ef862fe5649e16ceed76f60a2a364949b7b4" }, diff --git a/src/gallium/drivers/tegra/tegra_context.c b/src/gallium/drivers/tegra/tegra_context.c index 2dd525090ed..a459fa162dc 100644 --- a/src/gallium/drivers/tegra/tegra_context.c +++ b/src/gallium/drivers/tegra/tegra_context.c @@ -75,13 +75,13 @@ tegra_draw_vbo(struct pipe_context *pcontext, if (pindirect && pindirect->buffer) { memcpy(&indirect, pindirect, sizeof(indirect)); indirect.buffer = tegra_resource_unwrap(pindirect->buffer); + pindirect = &indirect; } if (pinfo->index_size && !pinfo->has_user_indices) info.index.resource = tegra_resource_unwrap(info.index.resource); pinfo = &info; - pindirect = &indirect; } context->gpu->draw_vbo(context->gpu, pinfo, pindirect, draws, num_draws); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
