diff options
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/opencl.c | 9 | ||||
| -rw-r--r-- | libhb/opencl.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libhb/opencl.c b/libhb/opencl.c index 8d846a824..d9bfc89b2 100644 --- a/libhb/opencl.c +++ b/libhb/opencl.c @@ -161,10 +161,13 @@ void hb_opencl_library_close(hb_opencl_library_t **_opencl) static int hb_opencl_device_is_supported(hb_opencl_device_t* device) { // we only support OpenCL on GPUs for now + // Ivy Bridge supports OpenCL on GPU, but it's too slow to be usable // FIXME: disable on NVIDIA to to a bug if ((device != NULL) && (device->type & CL_DEVICE_TYPE_GPU) && - (device->ocl_vendor != HB_OCL_VENDOR_NVIDIA)) + (device->ocl_vendor != HB_OCL_VENDOR_NVIDIA) && + (device->ocl_vendor != HB_OCL_VENDOR_INTEL || + hb_get_cpu_platform() != HB_CPU_PLATFORM_INTEL_IVB)) { int major, minor; // check OpenCL version: @@ -230,6 +233,10 @@ static hb_opencl_device_t* hb_opencl_device_get(hb_opencl_library_t *opencl, { device->ocl_vendor = HB_OCL_VENDOR_NVIDIA; } + else if (!strncmp(device->vendor, "Intel", 5 /* strlen("Intel") */)) + { + device->ocl_vendor = HB_OCL_VENDOR_INTEL; + } else { device->ocl_vendor = HB_OCL_VENDOR_OTHER; diff --git a/libhb/opencl.h b/libhb/opencl.h index 5548a9eb6..a31918d39 100644 --- a/libhb/opencl.h +++ b/libhb/opencl.h @@ -690,6 +690,7 @@ typedef struct hb_opencl_device_s { HB_OCL_VENDOR_AMD, HB_OCL_VENDOR_NVIDIA, + HB_OCL_VENDOR_INTEL, HB_OCL_VENDOR_OTHER, } ocl_vendor; } hb_opencl_device_t; |