diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-12 15:25:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-12 15:25:47 +0400 |
| commit | 3d38ad1b17028320efbd112cdcd75f77279ef035 (patch) | |
| tree | 5b31b843f2f22247c88a59d1f3da5e3a2972489a /intern/cycles/util | |
| parent | db1191d4519251ed93b570f0e09b375c249a4ef2 (diff) | |
Attempted fix for #32415: tighten up cycles opencl initialization checks to try to
avoid crashes. Don't think these should be needed but maybe it helps.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_opencl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/util/util_opencl.cpp b/intern/cycles/util/util_opencl.cpp index c9df9c2ff5c..40b637f5cb7 100644 --- a/intern/cycles/util/util_opencl.cpp +++ b/intern/cycles/util/util_opencl.cpp @@ -235,8 +235,10 @@ int clLibraryInit() __clewEnqueueBarrier = (PFNCLENQUEUEBARRIER )CLCC_DYNLIB_IMPORT(module, "clEnqueueBarrier"); __clewGetExtensionFunctionAddress = (PFNCLGETEXTENSIONFUNCTIONADDRESS )CLCC_DYNLIB_IMPORT(module, "clGetExtensionFunctionAddress"); - if(__clewGetPlatformIDs == NULL) - return 0; + if(__clewGetPlatformIDs == NULL) return 0; + if(__clewGetPlatformInfo == NULL) return 0; + if(__clewGetDeviceIDs == NULL) return 0; + if(__clewGetDeviceInfo == NULL) return 0; return 1; } |