Browse Source

hwcontext_opencl: Use correct function to enumerate devices

Also assert that all required functions are present.
tags/n4.2
Mark Thompson 7 years ago
parent
commit
21608bc303
1 changed files with 6 additions and 3 deletions
  1. +6
    -3
      libavutil/hwcontext_opencl.c

+ 6
- 3
libavutil/hwcontext_opencl.c View File

@@ -500,6 +500,9 @@ static int opencl_device_create_internal(AVHWDeviceContext *hwdev,
*device_name_src = NULL;
int err, found, p, d;

av_assert0(selector->enumerate_platforms &&
selector->enumerate_devices);

err = selector->enumerate_platforms(hwdev, &nb_platforms, &platforms,
selector->context);
if (err)
@@ -531,9 +534,9 @@ static int opencl_device_create_internal(AVHWDeviceContext *hwdev,
continue;
}

err = opencl_enumerate_devices(hwdev, platforms[p], platform_name,
&nb_devices, &devices,
selector->context);
err = selector->enumerate_devices(hwdev, platforms[p], platform_name,
&nb_devices, &devices,
selector->context);
if (err < 0)
continue;



Loading…
Cancel
Save