commit bd95f95dc56bbd512d4fe26e84e5e3df14da2f3e
author Marcin Ślusarz <marcin.slusarz@intel.com> Wed Dec 02 14:40:02 2020 +0100
committer Dylan Baker <dylan.c.baker@intel.com> Fri Dec 04 11:11:11 2020 -0800
tree f16bd1113d1d86c15b66d8331c35610d5af24344
parent 03802858b47b4a1187f33c163eebe8ed5fcbb916

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 <marcin.slusarz@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7885>
(cherry picked from commit 90515f90c8523bbf637a4dfdbce959adc45b4834)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index eb66635..a999a79 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"
     },

src/gallium/drivers/iris/iris_border_color.c

diff --git a/src/gallium/drivers/iris/iris_border_color.c b/src/gallium/drivers/iris/iris_border_color.c
index ebed3e4..5f6bea9 100644
--- a/src/gallium/drivers/iris/iris_border_color.c
+++ b/src/gallium/drivers/iris/iris_border_color.c
@@ -147,7 +147,7 @@
    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;
 }