From a8bc66b8b71968b76c2cc960dd30ead231b3aed9 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 20 Sep 2019 18:52:46 -0400 Subject: [PATCH] P4 to Git Change 2001950 by gandryey@gera-win10 on 2019/09/20 18:39:39 SWDEV-79445 - OCL generic changes and code clean-up - Fix LC path with 32bit binaries. Make sure sampler object has a check for 4 bytes. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#53 edit [ROCm/clr commit: e2601e29e463bcdfcd8522997839024c6038d93b] --- projects/clr/opencl/api/opencl/amdocl/cl_program.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp index 0ce55dbcc7..8c71b17a6f 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp @@ -1562,7 +1562,8 @@ RUNTIME_ENTRY(cl_int, clSetKernelArg, } } if ((!is_local && (arg_size != desc.size_)) || (is_local && (arg_size == 0))) { - if (LP64_ONLY(true ||) (desc.type_ != T_POINTER) || (arg_size != sizeof(void*))) { + if (LP64_ONLY(true ||) ((desc.type_ != T_POINTER) && (desc.type_ != T_SAMPLER)) || + (arg_size != sizeof(void*))) { as_amd(kernel)->parameters().reset(static_cast(arg_index)); return CL_INVALID_ARG_SIZE; }