@@ -36,21 +36,20 @@ SYCLMemObjT::SYCLMemObjT(ur_native_handle_t MemObject,
36
36
MSharedPtrStorage(nullptr ), MHostPtrProvided(true ),
37
37
MOwnNativeHandle(OwnNativeHandle) {
38
38
ur_context_handle_t Context = nullptr ;
39
- const AdapterPtr &Adapter = getAdapter ();
39
+ adapter_impl &Adapter = getAdapter ();
40
40
41
41
ur_mem_native_properties_t MemProperties = {
42
42
UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES, nullptr , OwnNativeHandle};
43
- Adapter-> call <UrApiKind::urMemBufferCreateWithNativeHandle>(
43
+ Adapter. call <UrApiKind::urMemBufferCreateWithNativeHandle>(
44
44
MemObject, MInteropContext->getHandleRef (), &MemProperties,
45
45
&MInteropMemObject);
46
46
47
47
// Get the size of the buffer in bytes
48
- Adapter->call <UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_SIZE,
49
- sizeof (size_t ), &MSizeInBytes,
50
- nullptr );
48
+ Adapter.call <UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_SIZE,
49
+ sizeof (size_t ), &MSizeInBytes, nullptr );
51
50
52
- Adapter-> call <UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
53
- sizeof (Context), &Context, nullptr );
51
+ Adapter. call <UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
52
+ sizeof (Context), &Context, nullptr );
54
53
55
54
if (MInteropContext->getHandleRef () != Context)
56
55
throw sycl::exception (
@@ -84,7 +83,7 @@ SYCLMemObjT::SYCLMemObjT(ur_native_handle_t MemObject,
84
83
MSharedPtrStorage(nullptr ), MHostPtrProvided(true ),
85
84
MOwnNativeHandle(OwnNativeHandle) {
86
85
ur_context_handle_t Context = nullptr ;
87
- const AdapterPtr &Adapter = getAdapter ();
86
+ adapter_impl &Adapter = getAdapter ();
88
87
89
88
ur_image_desc_t Desc = {};
90
89
Desc.stype = UR_STRUCTURE_TYPE_IMAGE_DESC;
@@ -101,12 +100,12 @@ SYCLMemObjT::SYCLMemObjT(ur_native_handle_t MemObject,
101
100
ur_mem_native_properties_t NativeProperties = {
102
101
UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES, nullptr , OwnNativeHandle};
103
102
104
- Adapter-> call <UrApiKind::urMemImageCreateWithNativeHandle>(
103
+ Adapter. call <UrApiKind::urMemImageCreateWithNativeHandle>(
105
104
MemObject, MInteropContext->getHandleRef (), &Format, &Desc,
106
105
&NativeProperties, &MInteropMemObject);
107
106
108
- Adapter-> call <UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
109
- sizeof (Context), &Context, nullptr );
107
+ Adapter. call <UrApiKind::urMemGetInfo>(MInteropMemObject, UR_MEM_INFO_CONTEXT,
108
+ sizeof (Context), &Context, nullptr );
110
109
111
110
if (MInteropContext->getHandleRef () != Context)
112
111
throw sycl::exception (
@@ -157,14 +156,13 @@ void SYCLMemObjT::updateHostMemory() {
157
156
releaseHostMem (MShadowCopy);
158
157
159
158
if (MOpenCLInterop) {
160
- const AdapterPtr &Adapter = getAdapter ();
161
- Adapter->call <UrApiKind::urMemRelease>(MInteropMemObject);
159
+ getAdapter ().call <UrApiKind::urMemRelease>(MInteropMemObject);
162
160
}
163
161
}
164
- const AdapterPtr &SYCLMemObjT::getAdapter () const {
162
+ adapter_impl &SYCLMemObjT::getAdapter () const {
165
163
assert ((MInteropContext != nullptr ) &&
166
164
" Trying to get Adapter from SYCLMemObjT with nullptr ContextImpl." );
167
- return (MInteropContext->getAdapter ());
165
+ return * (MInteropContext->getAdapter ());
168
166
}
169
167
170
168
bool SYCLMemObjT::isInterop () const { return MOpenCLInterop; }
0 commit comments