From ae7cdaba95b8127e1ff2b796d59a2e5e2b56138d Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 8 Oct 2014 19:29:54 -0400 Subject: [PATCH] P4 to Git Change 1085620 by lmoriche@lmoriche_opencl_dev on 2014/10/08 19:17:11 ECR #304775 - Fix the build broken by CL#1085562 Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd_amd.h#14 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#33 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#12 edit --- opencl/api/opencl/amdocl/cl_icd_amd.h | 2 +- opencl/api/opencl/amdocl/cl_program.cpp | 6 +++--- opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opencl/api/opencl/amdocl/cl_icd_amd.h b/opencl/api/opencl/amdocl/cl_icd_amd.h index 999fd180f7..5fa51722ed 100644 --- a/opencl/api/opencl/amdocl/cl_icd_amd.h +++ b/opencl/api/opencl/amdocl/cl_icd_amd.h @@ -831,7 +831,7 @@ typedef cl_int (CL_API_CALL * clGetPipeInfo_fn)( typedef cl_int (CL_API_CALL * clGetKernelSubGroupInfoKHR_fn)( cl_kernel /* kernel */, cl_device_id /* device */, - cl_kernel_sub_group_info /* param_name */, + const cl_kernel_sub_group_info /* param_name */, size_t /* input_value_size */, const void * /* input_value */, size_t /* param_value_size */, diff --git a/opencl/api/opencl/amdocl/cl_program.cpp b/opencl/api/opencl/amdocl/cl_program.cpp index 313e18ab2a..eabcc3fe44 100644 --- a/opencl/api/opencl/amdocl/cl_program.cpp +++ b/opencl/api/opencl/amdocl/cl_program.cpp @@ -1854,8 +1854,8 @@ RUNTIME_ENTRY(cl_int, clGetKernelSubGroupInfoKHR, ( // Get the corresponded parameters switch (param_name) { - case CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE: - case CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE: { + case CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE_KHR: + case CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE_KHR: { // Infer the number of dimensions from 'input_value_size' size_t dims = input_value_size / sizeof(size_t); @@ -1878,7 +1878,7 @@ RUNTIME_ENTRY(cl_int, clGetKernelSubGroupInfoKHR, ( return amd::clGetInfo( - (param_name == CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE) + (param_name == CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE_KHR) ? subGroupSize : numSubGroups, param_value_size, param_value, param_value_size_ret); } diff --git a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h index 0482df7849..e868fe5365 100644 --- a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h +++ b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h @@ -467,7 +467,7 @@ clGetKernelSubGroupInfoKHR(cl_kernel /* in_kernel */, const cl_kernel_sub_group_info /* param_name */, size_t /*input_value_size*/, const void * /*input_value*/, - size_t * /*param_value_size*/, + size_t /*param_value_size*/, void* /*param_value*/, size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0; @@ -477,7 +477,7 @@ typedef CL_API_ENTRY cl_int const cl_kernel_sub_group_info /* param_name */, size_t /*input_value_size*/, const void * /*input_value*/, - size_t * /*param_value_size*/, + size_t /*param_value_size*/, void* /*param_value*/, size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0; #endif /* CL_VERSION_2_0 */