diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2020-09-19 17:28:17 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-09-23 20:58:06 +0200 |
| commit | 5fedabe34b32b5487a6b102568aad5de9ae665dd (patch) | |
| tree | e7849467891a6f5952c2339a67ee0baf0257d34d | |
| parent | a4f2c6facefbb5aafe3beb41a793cac3794b5ad1 (diff) | |
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 <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6788>
(cherry picked from commit ade72e677b3e3d15221c0097c76573c36e47d0f8)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_semaphoreobjects.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.pick_status.json b/.pick_status.json index 151d38f494c..86fd7f02e01 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -562,7 +562,7 @@ "description": "st/mesa: Deal with empty textures/buffers in semaphore wait/signal.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/mesa/state_tracker/st_cb_semaphoreobjects.c b/src/mesa/state_tracker/st_cb_semaphoreobjects.c index 7a32d9b138f..dca4b209d32 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 */ |