Make sure context is set after enqueueEventsWait

enqueueEventsWait may set a different context, so we need to reset it
after returning.

Author: Hugh Delaney

source/adapters/hip/enqueue.cpp

@@ -229,12 +229,13 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferRead(
                                        &hBuffer->LastEventWritingToMemObj));
     }
 
-    ScopedContext Active(Device);
-
     // Use the default stream if copying from another device
     UR_CHECK_ERROR(enqueueEventsWait(hQueue, HIPStream, numEventsInWaitList,
                                      phEventWaitList));
 
+    // enqueueEventsWait may set a different context
+    ScopedContext Active(Device);
+
     if (phEvent) {
       RetImplEvent =
           std::unique_ptr<ur_event_handle_t_>(ur_event_handle_t_::makeNative(
@@ -596,11 +597,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferReadRect(
                                        &hBuffer->LastEventWritingToMemObj));
     }
 
-    ScopedContext Active(Device);
-
     UR_CHECK_ERROR(enqueueEventsWait(hQueue, HIPStream, numEventsInWaitList,
                                      phEventWaitList));
 
+    // enqueueEventsWait may set a different context
+    ScopedContext Active(Device);
+
     if (phEvent) {
       RetImplEvent =
           std::unique_ptr<ur_event_handle_t_>(ur_event_handle_t_::makeNative(