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

@@ -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 */,

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);
     }

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 */