commit ade72e677b3e3d15221c0097c76573c36e47d0f8
author Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Sat Sep 19 17:28:17 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Tue Sep 22 00:14:55 2020 +0000
tree 603b6b6e7cc369373fcb87c39727b943aa76c790
parent 08add9f61c96f749ae5830545ff91be195610daf

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>

src/mesa/state_tracker/st_cb_semaphoreobjects.c

diff --git a/src/mesa/state_tracker/st_cb_semaphoreobjects.c b/src/mesa/state_tracker/st_cb_semaphoreobjects.c
index 51288a8..6d97413 100644
--- a/src/mesa/state_tracker/st_cb_semaphoreobjects.c
+++ b/src/mesa/state_tracker/st_cb_semaphoreobjects.c
@@ -109,7 +109,8 @@
          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 @@
          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 @@
          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 @@
          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 */