Now LuxCore works even if OpenCL is available but not a valid OpenCL …

…ICD platform has been found (issue #422)
LuxCoreRender · Aug 2, 2020 · 7a5724a · 7a5724a
1 parent 3e143b6
commit 7a5724a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/release-notes.txt b/release-notes.txt
@@ -18,6 +18,7 @@
 ### Fixed Bugs
 
 * Added the support for pixel filtering to light tracing (issue #413)
+* Now LuxCore will work even if OpenCL is available but not a valid OpenCL ICD platform has been found (issue #422)
 
 Check https://wiki.luxcorerender.org/LuxCoreRender_Release_Notes for the full list
 of release notes.

diff --git a/src/luxrays/devices/ocldevice.cpp b/src/luxrays/devices/ocldevice.cpp
@@ -69,8 +69,14 @@ DeviceType OpenCLDeviceDescription::GetOCLDeviceType(const cl_device_id oclDevic
 
 void OpenCLDeviceDescription::GetPlatformsList(std::vector<cl_platform_id> &platformsList) {
 	cl_uint platformsCount;
-	CHECK_OCL_ERROR(clGetPlatformIDs(0, nullptr, &platformsCount));
-
+	const cl_int err = clGetPlatformIDs(0, nullptr, &platformsCount);
+	// -1001 is CL_PLATFORM_NOT_FOUND_KHR and it means not a valid OpenCL ICD has been
+	// found so I just return an empty list.
+	if (err == -1001)
+		return;
+	else
+		CHECK_OCL_ERROR(err);
+
 	platformsList.resize(platformsCount);
 	CHECK_OCL_ERROR(clGetPlatformIDs(platformsCount, &platformsList[0], nullptr));
 }