Module: Mesa Branch: master Commit: ade72e677b3e3d15221c0097c76573c36e47d0f8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ade72e677b3e3d15221c0097c76573c36e47d0f8
Author: Bas Nieuwenhuizen <[email protected]> Date: Sat Sep 19 17:28:17 2020 +0200 st/mesa: Deal with empty textures/buffers in semaphore wait/signal. The actual texture might not have been created yet. Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3257 CC: mesa-stable Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6788> --- src/mesa/state_tracker/st_cb_semaphoreobjects.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_semaphoreobjects.c b/src/mesa/state_tracker/st_cb_semaphoreobjects.c index 51288a87342..6d974135816 100644 --- a/src/mesa/state_tracker/st_cb_semaphoreobjects.c +++ b/src/mesa/state_tracker/st_cb_semaphoreobjects.c @@ -109,7 +109,8 @@ st_server_wait_semaphore(struct gl_context *ctx, continue; bufObj = st_buffer_object(bufObjs[i]); - pipe->flush_resource(pipe, bufObj->buffer); + if (bufObj->buffer) + pipe->flush_resource(pipe, bufObj->buffer); } for (unsigned i = 0; i < numTextureBarriers; i++) { @@ -117,7 +118,8 @@ st_server_wait_semaphore(struct gl_context *ctx, continue; texObj = st_texture_object(texObjs[i]); - pipe->flush_resource(pipe, texObj->pt); + if (texObj->pt) + pipe->flush_resource(pipe, texObj->pt); } } @@ -141,7 +143,8 @@ st_server_signal_semaphore(struct gl_context *ctx, continue; bufObj = st_buffer_object(bufObjs[i]); - pipe->flush_resource(pipe, bufObj->buffer); + if (bufObj->buffer) + pipe->flush_resource(pipe, bufObj->buffer); } for (unsigned i = 0; i < numTextureBarriers; i++) { @@ -149,7 +152,8 @@ st_server_signal_semaphore(struct gl_context *ctx, continue; texObj = st_texture_object(texObjs[i]); - pipe->flush_resource(pipe, texObj->pt); + if (texObj->pt) + pipe->flush_resource(pipe, texObj->pt); } /* The driver is allowed to flush during fence_server_signal, be prepared */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
