Module: Mesa Branch: staging/20.3 Commit: bd95f95dc56bbd512d4fe26e84e5e3df14da2f3e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd95f95dc56bbd512d4fe26e84e5e3df14da2f3e
Author: Marcin Ślusarz <[email protected]> Date: Wed Dec 2 14:40:02 2020 +0100 iris: store copy of the border color in the border color hash table Color can be allocated on the stack since 809a81ec3a0. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3909 Fixes: 809a81ec3a0 ("iris: Properly support alpha and luminance-alpha formats") Debugged-by: Filip Strömbäck Signed-off-by: Marcin Ślusarz <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7885> (cherry picked from commit 90515f90c8523bbf637a4dfdbce959adc45b4834) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_border_color.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index eb666354135..a999a79564b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -103,7 +103,7 @@ "description": "iris: store copy of the border color in the border color hash table", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "809a81ec3a0b8666ec426a88b86fb133ae5f1bcb" }, diff --git a/src/gallium/drivers/iris/iris_border_color.c b/src/gallium/drivers/iris/iris_border_color.c index ebed3e4445d..5f6bea9a79f 100644 --- a/src/gallium/drivers/iris/iris_border_color.c +++ b/src/gallium/drivers/iris/iris_border_color.c @@ -147,7 +147,7 @@ iris_upload_border_color(struct iris_context *ice, memcpy(pool->map + offset, color, sizeof(*color)); pool->insert_point += BC_ALIGNMENT; - _mesa_hash_table_insert_pre_hashed(pool->ht, hash, color, + _mesa_hash_table_insert_pre_hashed(pool->ht, hash, pool->map + offset, (void *) (uintptr_t) offset); return offset; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
