[PATCH] opencl: Add OpenCL 1.1 implementation.

[Nakarin Khankham]

On 02/03/2019 19:18, Nikolay Sivov wrote:
> On 3/2/19 2:02 PM, Khral Steelforge wrote:
> 
>> Signed-off-by: Nakarin Khankham <garuda2550 at gmail.com>
>> ---
>>   dlls/opencl/opencl.c    | 188 ++++++++++++++++++++++++++++++++++++++++
>>   dlls/opencl/opencl.spec |  10 +++
>>   2 files changed, 198 insertions(+)
>>
>> diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c
>> index 2d145bf25c..ec046a669e 100644
>> --- a/dlls/opencl/opencl.c
>> +++ b/dlls/opencl/opencl.c
>> @@ -295,6 +295,21 @@ cl_mem WINAPI wine_clCreateBuffer(cl_context context, cl_mem_flags flags, size_t
>>       return ret;
>>   }
>>   +cl_mem WINAPI wine_clCreateSubBuffer(cl_mem buffer, cl_mem_flags flags,
>> +                                     cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret)
>> +{
>> +#ifdef CL_VERSION_1_1
>> +    cl_mem ret;
>> +    TRACE("\n");
>> +    ret = clCreateSubBuffer(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret);
>> +    return ret;
>> +#else
>> +    FIXME("stub\n");
>> +    *errcode_ret = CL_SUCCESS;
>> +    return NULL;
>> +#endif
>> +}
>> +
> 
> Looks like this should be accessed dynamically. How capabilities are reported for OpenCL, e.g. if I've built this with 1.1+ dev library support, and run it on 1.0 host what should happen when application sees 1.1 export?

Thankyou for the feedback.

By dynamically access the functions, you mean use dlopen and dlsym function? (in wine case, wine_dlopen and wine_dlsym?)

something like this?

...
#define SONAME_LIBOPENCL "libOpenCL.so.1" /* this might be better auto generate by the configure script */
static void* opencl_handle = NULL;
static cl_mem (*p_clCreateSubBuffer)(cl_mem buffer, cl_mem_flags flags,
                                     cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret);
...
cl_mem WINAPI wine_clCreateSubBuffer(cl_mem buffer, cl_mem_flags flags,
                                     cl_buffer_create_type buffer_create_type, const void * buffer_create_info, cl_int * errcode_ret)
{
#ifdef CL_VERSION_1_1
    cl_mem ret;
    char error[200];
    TRACE("\n");

    if(!opencl_handle)
    {
        opencl_handle = wine_dlopen(SONAME_LIBOPENCL, RTLD_NOW, error, sizeof(error));
        if (opencl_handle == NULL)
        {
            ERR( "Failed to load OpenCL: %s\n", error );
            return 0;
        }
    }

#define LOAD_FUNCPTR(f) do if (!(p_##f = wine_dlsym( opencl_handle, #f, error, sizeof(error) ))) \
    { \
        ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOPENCL, error ); \
        goto failed; \
    } while(0)

    LOAD_FUNCPTR(clCreateSubBuffer);
#undef LOAD_FUNCPTR

    ret = p_clCreateSubBuffer(buffer, flags, buffer_create_type, buffer_create_info, errcode_ret);
    return ret;

failed:
    wine_dlclose( opencl_handle, NULL, 0 );
    opencl_handle = NULL;
    return 0;

#else
    FIXME("stub\n");
    *errcode_ret = CL_SUCCESS;
    return NULL;
#endif
}

If yes, then I think I can improve this patch with guidance from examples in wine's source code.