]> granicus.if.org Git - imagemagick/commitdiff
Check default_CLEnv instead of loading the OpenCL environment
authorDirk Lemstra <dirk@lemstra.org>
Thu, 29 Aug 2019 20:00:14 +0000 (22:00 +0200)
committerDirk Lemstra <dirk@lemstra.org>
Thu, 29 Aug 2019 20:07:58 +0000 (22:07 +0200)
MagickCore/opencl.c

index 7826722b425f251e92ae2352fd8d8429be143d5e..f3f23c146aebbbc069b7ab783a39f573fdd1e6ff 100644 (file)
@@ -1534,35 +1534,31 @@ MagickPrivate void DumpOpenCLProfileData()
   FILE
     *log;
 
-  MagickCLEnv
-    clEnv;
-
   size_t
     i,
     j;
 
-  clEnv=GetCurrentOpenCLEnv();
-  if (clEnv == (MagickCLEnv) NULL)
+  if (default_CLEnv == (MagickCLEnv) NULL)
     return;
 
-  for (i = 0; i < clEnv->number_devices; i++)
-    if (clEnv->devices[i]->profile_kernels != MagickFalse)
+  for (i = 0; i < default_CLEnv->number_devices; i++)
+    if (default_CLEnv->devices[i]->profile_kernels != MagickFalse)
       break;
-  if (i == clEnv->number_devices)
+  if (i == default_CLEnv->number_devices)
     return;
 
   (void) FormatLocaleString(filename,MagickPathExtent,"%s%s%s",
     GetOpenCLCacheDirectory(),DirectorySeparator,"ImageMagickOpenCL.log");
 
-  log = fopen_utf8(filename,"wb");
+  log=fopen_utf8(filename,"wb");
   if (log == (FILE *) NULL)
     return;
-  for (i = 0; i < clEnv->number_devices; i++)
+  for (i = 0; i < default_CLEnv->number_devices; i++)
   {
     MagickCLDevice
       device;
 
-    device=clEnv->devices[i];
+    device=default_CLEnv->devices[i];
     if ((device->profile_kernels == MagickFalse) ||
         (device->profile_records == (KernelProfileRecord *) NULL))
       continue;
@@ -1739,7 +1735,7 @@ MagickPrivate MagickBooleanType EnqueueOpenCLKernel(cl_command_queue queue,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   G e t C u r r u n t O p e n C L E n v                                     %
++   G e t C u r r e n t O p e n C L E n v                                     %
 %                                                                             %
 %                                                                             %
 %                                                                             %