|
15 | 15 | #include <CL/sycl/detail/common.hpp>
|
16 | 16 | #include <CL/sycl/detail/export.hpp>
|
17 | 17 | #include <CL/sycl/detail/generic_type_traits.hpp>
|
| 18 | +#include <CL/sycl/detail/handler_proxy.hpp> |
18 | 19 | #include <CL/sycl/detail/image_accessor_util.hpp>
|
19 | 20 | #include <CL/sycl/detail/image_ocl_types.hpp>
|
20 | 21 | #include <CL/sycl/exception.hpp>
|
21 |
| -#include <CL/sycl/handler.hpp> |
22 | 22 | #include <CL/sycl/id.hpp>
|
23 | 23 | #include <CL/sycl/image.hpp>
|
24 | 24 | #include <CL/sycl/pointers.hpp>
|
@@ -846,7 +846,7 @@ class accessor :
|
846 | 846 | detail::convertToArrayOfN<3, 1>(BufferRef.get_range()), AccessMode,
|
847 | 847 | detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
|
848 | 848 | BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
|
849 |
| - CommandGroupHandler.associateWithHandler(*this); |
| 849 | + detail::associateWithHandler(CommandGroupHandler, this, AccessTarget); |
850 | 850 | }
|
851 | 851 | #endif
|
852 | 852 |
|
@@ -888,7 +888,7 @@ class accessor :
|
888 | 888 | detail::convertToArrayOfN<3, 1>(BufferRef.get_range()), AccessMode,
|
889 | 889 | detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
|
890 | 890 | BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
|
891 |
| - CommandGroupHandler.associateWithHandler(*this); |
| 891 | + detail::associateWithHandler(CommandGroupHandler, this, AccessTarget); |
892 | 892 | }
|
893 | 893 | #endif
|
894 | 894 |
|
@@ -932,7 +932,7 @@ class accessor :
|
932 | 932 | AccessMode, detail::getSyclObjImpl(BufferRef).get(),
|
933 | 933 | Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
|
934 | 934 | BufferRef.IsSubBuffer) {
|
935 |
| - CommandGroupHandler.associateWithHandler(*this); |
| 935 | + detail::associateWithHandler(CommandGroupHandler, this, AccessTarget); |
936 | 936 | }
|
937 | 937 | #endif
|
938 | 938 |
|
@@ -1238,7 +1238,10 @@ class accessor<DataT, Dimensions, AccessMode, access::target::image,
|
1238 | 1238 | access::target::image, IsPlaceholder>(
|
1239 | 1239 | Image, CommandGroupHandler,
|
1240 | 1240 | (detail::getSyclObjImpl(Image))->getElementSize()) {
|
1241 |
| - CommandGroupHandler.associateWithHandler(*this); |
| 1241 | +#ifndef __SYCL_DEVICE_ONLY__ |
| 1242 | + detail::associateWithHandler(CommandGroupHandler, this, |
| 1243 | + access::target::image); |
| 1244 | +#endif |
1242 | 1245 | }
|
1243 | 1246 | #ifdef __SYCL_DEVICE_ONLY__
|
1244 | 1247 | private:
|
@@ -1313,7 +1316,10 @@ class accessor<DataT, Dimensions, AccessMode, access::target::image_array,
|
1313 | 1316 | access::target::image, IsPlaceholder>(
|
1314 | 1317 | Image, CommandGroupHandler,
|
1315 | 1318 | (detail::getSyclObjImpl(Image))->getElementSize()) {
|
1316 |
| - CommandGroupHandler.associateWithHandler(*this); |
| 1319 | +#ifndef __SYCL_DEVICE_ONLY__ |
| 1320 | + detail::associateWithHandler(CommandGroupHandler, this, |
| 1321 | + access::target::image_array); |
| 1322 | +#endif |
1317 | 1323 | }
|
1318 | 1324 |
|
1319 | 1325 | detail::__image_array_slice__<DataT, Dimensions, AccessMode, IsPlaceholder>
|
|
0 commit comments