Module: Mesa Branch: staging/21.0 Commit: 80bcbfdf1a9d7975ca1246b4c43f877f6035dff1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80bcbfdf1a9d7975ca1246b4c43f877f6035dff1
Author: Karol Herbst <[email protected]> Date: Fri Mar 5 10:46:48 2021 +0100 tegra/context: unwrap indirect_draw_count as well Fixes: 22f6624ed318 "gallium: separate indirect stuff from pipe_draw_info - 80 -> 56 bytes" 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 12f1e42ed34e9807484bdfbec535bc56950e2338) --- .pick_status.json | 2 +- src/gallium/drivers/tegra/tegra_context.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 2053726c6a8..5572ceceba4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1120,7 +1120,7 @@ "description": "tegra/context: unwrap indirect_draw_count as well", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "22f6624ed318e8131681ec1f2e7b3a59449df412" }, diff --git a/src/gallium/drivers/tegra/tegra_context.c b/src/gallium/drivers/tegra/tegra_context.c index a459fa162dc..4d7c295957b 100644 --- a/src/gallium/drivers/tegra/tegra_context.c +++ b/src/gallium/drivers/tegra/tegra_context.c @@ -75,6 +75,7 @@ tegra_draw_vbo(struct pipe_context *pcontext, if (pindirect && pindirect->buffer) { memcpy(&indirect, pindirect, sizeof(indirect)); indirect.buffer = tegra_resource_unwrap(pindirect->buffer); + indirect.indirect_draw_count = tegra_resource_unwrap(pindirect->indirect_draw_count); pindirect = &indirect; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
