Attachment 127204 Details for Bug 98172 – Work with a local reference of so->fence

[patch] Work with a local reference of so->fence

st-mesa-sync-fence-threadsafe.diff (text/plain), 2.07 KB, created by Michel Dänzer on 2016-10-11 07:36:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2016-10-11 07:36:09 UTC

Size: 2.07 KB

patch

obsolete

>diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c
>index 123925a..de01880 100644
>--- a/src/mesa/state_tracker/st_cb_syncobj.c
>+++ b/src/mesa/state_tracker/st_cb_syncobj.c
>@@ -81,17 +81,22 @@ static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)
>    struct pipe_context *pipe = st_context(ctx)->pipe;
>    struct pipe_screen *screen = pipe->screen;
>    struct st_sync_object *so = (struct st_sync_object*)obj;
>+   struct pipe_fence_handle *fence = NULL;
>+
>+   screen->fence_reference(screen, &fence, so->fence);
> 
>    /* If the fence doesn't exist, assume it's signalled. */
>-   if (!so->fence) {
>+   if (!fence) {
>       so->b.StatusFlag = GL_TRUE;
>       return;
>    }
> 
>-   if (screen->fence_finish(screen, pipe, so->fence, 0)) {
>+   if (screen->fence_finish(screen, pipe, fence, 0)) {
>       screen->fence_reference(screen, &so->fence, NULL);
>       so->b.StatusFlag = GL_TRUE;
>    }
>+
>+   screen->fence_reference(screen, &fence, NULL);
> }
> 
> static void st_client_wait_sync(struct gl_context *ctx,
>@@ -101,9 +106,12 @@ static void st_client_wait_sync(struct gl_context *ctx,
>    struct pipe_context *pipe = st_context(ctx)->pipe;
>    struct pipe_screen *screen = pipe->screen;
>    struct st_sync_object *so = (struct st_sync_object*)obj;
>+   struct pipe_fence_handle *fence = NULL;
>+
>+   screen->fence_reference(screen, &fence, so->fence);
> 
>    /* If the fence doesn't exist, assume it's signalled. */
>-   if (!so->fence) {
>+   if (!fence) {
>       so->b.StatusFlag = GL_TRUE;
>       return;
>    }
>@@ -120,11 +128,12 @@ static void st_client_wait_sync(struct gl_context *ctx,
>     * Assume GL_SYNC_FLUSH_COMMANDS_BIT is always set, because applications
>     * forget to set it.
>     */
>-   if (so->fence &&
>-       screen->fence_finish(screen, pipe, so->fence, timeout)) {
>+   if (screen->fence_finish(screen, pipe, fence, timeout)) {
>       screen->fence_reference(screen, &so->fence, NULL);
>       so->b.StatusFlag = GL_TRUE;
>    }
>+
>+   screen->fence_reference(screen, &fence, NULL);
> }
> 
> static void st_server_wait_sync(struct gl_context *ctx,

Actions: View | Splinter Review

Attachments on bug 98172: 127204 | 127237 | 127267 | 127316 | 127317 | 127366 | 127413

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.