CL/VK: Fix enqueueFillImage & enqueueMapImage lock and waitlist

Fix in enqueueFillImage and enqueueMapImage.
Semantically should be using scoped lock and processWaitlist()
instead of enqueueWaitForEvents().

Bug: angleproject:390387802
Change-Id: I86173a079aa7fdd54a8b7158ec8214147cfb7cd2
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6179619
Reviewed-by: Austin Annestrand <[email protected]>
Reviewed-by: Shahbaz Youssefi <[email protected]>
Reviewed-by: Geoff Lang <[email protected]>
Commit-Queue: Shahbaz Youssefi <[email protected]>

src/libANGLE/renderer/vulkan/CLCommandQueueVk.cpp

@@ -950,14 +950,16 @@ angle::Result CLCommandQueueVk::enqueueFillImage(const cl::Image &image,
                                                  const cl::EventPtrs &waitEvents,
                                                  CLEventImpl::CreateFunc *eventCreateFunc)
 {
+    std::scoped_lock<std::mutex> sl(mCommandQueueMutex);
+
+    ANGLE_TRY(processWaitlist(waitEvents));
+
     CLImageVk &imageVk = image.getImpl<CLImageVk>();
     PixelColor packedColor;
     cl::Extents extent = imageVk.getImageExtent();
 
     imageVk.packPixels(fillColor, &packedColor);
 
-    ANGLE_TRY(enqueueWaitForEvents(waitEvents));
-
     if (imageVk.isStagingBufferInitialized() == false)
     {
         ANGLE_TRY(imageVk.createStagingBuffer(imageVk.getSize()));
@@ -1037,7 +1039,9 @@ angle::Result CLCommandQueueVk::enqueueMapImage(const cl::Image &image,
                                                 CLEventImpl::CreateFunc *eventCreateFunc,
                                                 void *&mapPtr)
 {
-    ANGLE_TRY(enqueueWaitForEvents(waitEvents));
+    std::scoped_lock<std::mutex> sl(mCommandQueueMutex);
+
+    ANGLE_TRY(processWaitlist(waitEvents));
 
     // TODO: Look into better enqueue handling of this map-op if non-blocking
     // https://anglebug.com/376722715