fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: set the ctx parameter of fence_finish

Browse source 
for deferred flushes

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-08-06 17:00:20 +02:00
parent 54272e18a6
commit 1cc95a1255
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,8 @@ static void st_fence_sync(struct gl_context *ctx, struct gl_sync_object *obj,
static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)
{
struct pipe_screen *screen = st_context(ctx)->pipe->screen;
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. */
@ -87,7 +88,7 @@ static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)
return;
}
if (screen->fence_finish(screen, NULL, so->fence, 0)) {
if (screen->fence_finish(screen, pipe, so->fence, 0)) {
screen->fence_reference(screen, &so->fence, NULL);
so->b.StatusFlag = GL_TRUE;
}
@ -97,7 +98,8 @@ static void st_client_wait_sync(struct gl_context *ctx,
struct gl_sync_object *obj,
GLbitfield flags, GLuint64 timeout)
{
struct pipe_screen *screen = st_context(ctx)->pipe->screen;
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. */
@ -106,11 +108,20 @@ static void st_client_wait_sync(struct gl_context *ctx,
return;
}
/* We don't care about GL_SYNC_FLUSH_COMMANDS_BIT, because flush is
* already called when creating a fence. */
/* Section 4.1.2 of OpenGL 4.5 (Compatibility Profile) says:
* [...] if ClientWaitSync is called and all of the following are true:
* - the SYNC_FLUSH_COMMANDS_BIT bit is set in flags,
* - sync is unsignaled when ClientWaitSync is called,
* - and the calls to ClientWaitSync and FenceSync were issued from
* the same context,
* then the GL will behave as if the equivalent of Flush were inserted
* immediately after the creation of sync.
*
* Assume GL_SYNC_FLUSH_COMMANDS_BIT is always set, because applications
* forget to set it.
*/
if (so->fence &&
screen->fence_finish(screen, NULL, so->fence, timeout)) {
screen->fence_finish(screen, pipe, so->fence, timeout)) {
screen->fence_reference(screen, &so->fence, NULL);
so->b.StatusFlag = GL_TRUE;
}