Mesa (master): clover/event: Include additional event statuses for clSetEventCallback

[Aaron Watry]

Module: Mesa
Branch: master
Commit: a8296dbd5a7d90a3a52e7a28fce5b8e8982efbeb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8296dbd5a7d90a3a52e7a28fce5b8e8982efbeb

Author: Aaron Watry <awatry at gmail.com>
Date:   Thu Aug  3 20:55:18 2017 -0500

clover/event: Include additional event statuses for clSetEventCallback

>From CL 2.0 Section 5.11 (Event Objects):
  clSetEventCallback returns CL_SUCCESS if the function is executed successfully. Otherwise, it
  returns one of the following errors:
    ...
    CL_INVALID_VALUE if pfn_event_notify is NULL or if command_exec_callback_type is
    not CL_SUBMITTED , CL_RUNNING or CL_COMPLETE .

Fixes: OpenCL CTS test_conformance/events/test_events callbacks

Signed-off-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/gallium/state_trackers/clover/api/event.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/api/event.cpp b/src/gallium/state_trackers/clover/api/event.cpp
index 5d1a0e52c5..3f89644d0a 100644
--- a/src/gallium/state_trackers/clover/api/event.cpp
+++ b/src/gallium/state_trackers/clover/api/event.cpp
@@ -126,7 +126,8 @@ clSetEventCallback(cl_event d_ev, cl_int type,
                    void *user_data) try {
    auto &ev = obj(d_ev);
 
-   if (!pfn_notify || type != CL_COMPLETE)
+   if (!pfn_notify ||
+       (type != CL_COMPLETE && type != CL_SUBMITTED && type != CL_RUNNING))
       throw error(CL_INVALID_VALUE);
 
    // Create a temporary soft event that depends on ev, with