fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

st/mesa: unduplicate st_check_sync code

Browse source 
It's the same as st_client_wait_sync. Discovered by Michel.
This is needed to make the following fix simpler.

Cc: 12.0 13.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit f240ad98bc)
This commit is contained in:
Marek Olšák 2016-10-25 12:58:03 +02:00 • committed by Emil Velikov
parent 9c5bbfcbc8
commit c29a37c444
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/mesa/state_tracker/st_cb_syncobj.c
View file

@ -76,24 +76,6 @@ static void st_fence_sync(struct gl_context *ctx, struct gl_sync_object *obj,
pipe->flush(pipe, &so->fence, PIPE_FLUSH_DEFERRED);
}
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;
/* If the fence doesn't exist, assume it's signalled. */
if (!so->fence) {
so->b.StatusFlag = GL_TRUE;
return;
}
if (screen->fence_finish(screen, pipe, so->fence, 0)) {
screen->fence_reference(screen, &so->fence, NULL);
so->b.StatusFlag = GL_TRUE;
}
}
static void st_client_wait_sync(struct gl_context *ctx,
struct gl_sync_object *obj,
GLbitfield flags, GLuint64 timeout)
@ -120,13 +102,17 @@ 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, so->fence, timeout)) {
screen->fence_reference(screen, &so->fence, NULL);
so->b.StatusFlag = GL_TRUE;
}
}
static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)
{
st_client_wait_sync(ctx, obj, 0, 0);
}
static void st_server_wait_sync(struct gl_context *ctx,
struct gl_sync_object *obj,
GLbitfield flags, GLuint64 timeout)