diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2020-08-25 09:39:06 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-24 20:55:02 +0000 |
| commit | 7971918924dd84c2f33a5b7f0a8bf0c23ed994d8 (patch) | |
| tree | 05abcb89e9c42c4e6edf6649422cdf0f3b6db833 | |
| parent | bc5c0433be806e458d0a91a9a7df342c70a5d1ee (diff) | |
zink: reorder create_stream_output_target to fix failure case leak
the previous version of this leaked a reference to the streamout buffer here
thanks to deltragon on my blog for pointing this out!
Fixes: 37778fcd9a35 ("zink: implement transform feedback support to finish off opengl 3.0")
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6457>
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index a0eaddf9e2e..89cc78d7c67 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1002,12 +1002,6 @@ zink_create_stream_output_target(struct pipe_context *pctx, if (!t) return NULL; - t->base.reference.count = 1; - t->base.context = pctx; - pipe_resource_reference(&t->base.buffer, pres); - t->base.buffer_offset = buffer_offset; - t->base.buffer_size = buffer_size; - /* using PIPE_BIND_CUSTOM here lets us create a custom pipe buffer resource, * which allows us to differentiate and use VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT * as we must for this case @@ -1018,6 +1012,12 @@ zink_create_stream_output_target(struct pipe_context *pctx, return NULL; } + t->base.reference.count = 1; + t->base.context = pctx; + pipe_resource_reference(&t->base.buffer, pres); + t->base.buffer_offset = buffer_offset; + t->base.buffer_size = buffer_size; + return &t->base; } |