From d17b35e671ae7c6ab6b89973506d12b958d2264d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 15 Jul 2016 15:44:29 +0200 Subject: [PATCH] gallium: add PIPE_FLUSH_DEFERRED There are 2 uses: - Asynchronous flushing for multithreaded drivers. - Return a fence without flushing (mid-command-buffer fence). The driver can defer flushing until fence_finish is called. This is required to make Bioshock Infinite faster, which creates 1000 fences (flushes) per frame. Reviewed-by: Edward O'Callaghan Reviewed-by: Rob Clark --- src/gallium/docs/source/context.rst | 10 ++++++++++ src/gallium/include/pipe/p_defines.h | 3 ++- src/mesa/state_tracker/st_cb_syncobj.c | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst index 05c6f11ea48..8fb621bcac3 100644 --- a/src/gallium/docs/source/context.rst +++ b/src/gallium/docs/source/context.rst @@ -463,6 +463,16 @@ Flushing ``flush`` +PIPE_FLUSH_END_OF_FRAME: Whether the flush marks the end of frame. + +PIPE_FLUSH_DEFERRED: It is not required to flush right away, but it is required +to return a valid fence. The behavior of fence_finish or any other call isn't +changed. The only side effect can be that fence_finish will wait a little +longer. No guidance is given as to how drivers should implement fence_finish +with deferred flushes. If some drivers can't do deferred flushes safely, they +should just ignore the flag. + + ``flush_resource`` diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 3ab6c2f62b0..2524e424d7b 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -348,7 +348,8 @@ enum pipe_transfer_usage */ enum pipe_flush_flags { - PIPE_FLUSH_END_OF_FRAME = (1 << 0) + PIPE_FLUSH_END_OF_FRAME = (1 << 0), + PIPE_FLUSH_DEFERRED = (1 << 1), }; /** diff --git a/src/mesa/state_tracker/st_cb_syncobj.c b/src/mesa/state_tracker/st_cb_syncobj.c index ec2687fba53..69f2a289ada 100644 --- a/src/mesa/state_tracker/st_cb_syncobj.c +++ b/src/mesa/state_tracker/st_cb_syncobj.c @@ -73,7 +73,7 @@ static void st_fence_sync(struct gl_context *ctx, struct gl_sync_object *obj, assert(condition == GL_SYNC_GPU_COMMANDS_COMPLETE && flags == 0); assert(so->fence == NULL); - pipe->flush(pipe, &so->fence, 0); + pipe->flush(pipe, &so->fence, PIPE_FLUSH_DEFERRED); } static void st_check_sync(struct gl_context *ctx, struct gl_sync_object *obj)