Mesa (master): ralloc: Fix ralloc_adopt() to the old context's last child' s parent.

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Dec 19 07:32:23 UTC 2015


Module: Mesa
Branch: master
Commit: 14193e4643370db92210710f2ef152c693d6c4ff
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=14193e4643370db92210710f2ef152c693d6c4ff

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Dec 18 02:48:34 2015 -0800

ralloc: Fix ralloc_adopt() to the old context's last child's parent.

I was cleverly using one iteration to obtain a pointer to the last item
in ralloc's singly list child list, while also setting parents.

Unfortunately, I forgot to set the parent on that last item.

Cc: "11.1 11.0 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/util/ralloc.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/ralloc.c b/src/util/ralloc.c
index bb4cf96..6d4032b 100644
--- a/src/util/ralloc.c
+++ b/src/util/ralloc.c
@@ -293,6 +293,7 @@ ralloc_adopt(const void *new_ctx, void *old_ctx)
 
    /* Connect the two lists together; parent them to new_ctx; make old_ctx empty. */
    child->next = new_info->child;
+   child->parent = new_info;
    new_info->child = old_info->child;
    old_info->child = NULL;
 }




More information about the mesa-commit mailing list