From 820779f6ede3291227581c2b3f8acaf71a91ee0c Mon Sep 17 00:00:00 2001
From: omarahmed1111 <omar.ahmed@codeplay.com>
Date: Wed, 20 Mar 2024 16:28:59 +0000
Subject: [PATCH] Fix some casts after rebase

---
 source/adapters/opencl/command_buffer.cpp | 2 +-
 source/adapters/opencl/device.cpp         | 2 +-
 source/adapters/opencl/program.cpp        | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/source/adapters/opencl/command_buffer.cpp b/source/adapters/opencl/command_buffer.cpp
index 1c57246eca..c3e31dd580 100644
--- a/source/adapters/opencl/command_buffer.cpp
+++ b/source/adapters/opencl/command_buffer.cpp
@@ -396,7 +396,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferGetInfoExp(
     ur_exp_command_buffer_info_t propName, size_t propSize, void *pPropValue,
     size_t *pPropSizeRet) {
 
-  cl_context CLContext = cl_adapter::cast<cl_context>(hCommandBuffer->hContext);
+  cl_context CLContext = hCommandBuffer->hContext->get();
   cl_ext::clGetCommandBufferInfoKHR_fn clGetCommandBufferInfoKHR = nullptr;
   cl_int Res =
       cl_ext::getExtFuncFromContext<decltype(clGetCommandBufferInfoKHR)>(
diff --git a/source/adapters/opencl/device.cpp b/source/adapters/opencl/device.cpp
index 62ae68b7cc..f928ed23a6 100644
--- a/source/adapters/opencl/device.cpp
+++ b/source/adapters/opencl/device.cpp
@@ -904,7 +904,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
   }
 
   case UR_DEVICE_INFO_COMMAND_BUFFER_SUPPORT_EXP: {
-    cl_device_id Dev = cl_adapter::cast<cl_device_id>(hDevice);
+    cl_device_id Dev = hDevice->get();
     size_t ExtSize = 0;
     CL_RETURN_ON_FAILURE(
         clGetDeviceInfo(Dev, CL_DEVICE_EXTENSIONS, 0, nullptr, &ExtSize));
diff --git a/source/adapters/opencl/program.cpp b/source/adapters/opencl/program.cpp
index 6e5c50ef2f..1a96db222f 100644
--- a/source/adapters/opencl/program.cpp
+++ b/source/adapters/opencl/program.cpp
@@ -533,9 +533,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramGetGlobalVariablePointer(
     void **ppGlobalVariablePointerRet) {
 
   cl_context CLContext = nullptr;
-  CL_RETURN_ON_FAILURE(clGetProgramInfo(cl_adapter::cast<cl_program>(hProgram),
-                                        CL_PROGRAM_CONTEXT, sizeof(CLContext),
-                                        &CLContext, nullptr));
+  CL_RETURN_ON_FAILURE(clGetProgramInfo(hProgram->get(), CL_PROGRAM_CONTEXT,
+                                        sizeof(CLContext), &CLContext,
+                                        nullptr));
 
   cl_ext::clGetDeviceGlobalVariablePointer_fn FuncT = nullptr;
 
@@ -545,8 +545,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramGetGlobalVariablePointer(
       cl_ext::GetDeviceGlobalVariablePointerName, &FuncT));
 
   const cl_int CLResult =
-      FuncT(cl_adapter::cast<cl_device_id>(hDevice),
-            cl_adapter::cast<cl_program>(hProgram), pGlobalVariableName,
+      FuncT(hDevice->get(), hProgram->get(), pGlobalVariableName,
             pGlobalVariableSizeRet, ppGlobalVariablePointerRet);
 
   if (CLResult != CL_SUCCESS) {