diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-12-27 23:23:05 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-12-27 23:23:05 -0800 |
| commit | ea77b384e8c575922eca1c05398e19fcbfda9b09 (patch) | |
| tree | 4f8659bd8b48af785896daa224f6698a5ee269ec /src/util | |
| parent | f948767471ba83427cbcdc244a511fbb954ca9e0 (diff) | |
| parent | 109c348284843054f708f4403260739b7db18275 (diff) | |
| download | external_mesa3d-ea77b384e8c575922eca1c05398e19fcbfda9b09.zip external_mesa3d-ea77b384e8c575922eca1c05398e19fcbfda9b09.tar.gz external_mesa3d-ea77b384e8c575922eca1c05398e19fcbfda9b09.tar.bz2 | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in tessellation and the store_var changes that go with it.
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/ralloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |