[opencl] Remove all static members

and rely on the default() mechanism, this prevents random crashes on exit when dtor is called on the statics cherry-pick 868b04d
qgis · Dec 5, 2018 · bd36edb · bd36edb
1 parent c455bf6
commit bd36edb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/core/qgsopenclutils.cpp b/src/core/qgsopenclutils.cpp
@@ -27,8 +27,6 @@ QLatin1String QgsOpenClUtils::SETTINGS_GLOBAL_ENABLED_KEY = QLatin1Literal( "Ope
 QLatin1String QgsOpenClUtils::SETTINGS_DEFAULT_DEVICE_KEY = QLatin1Literal( "OpenClDefaultDevice" );
 QLatin1String QgsOpenClUtils::LOGMESSAGE_TAG = QLatin1Literal( "OpenCL" );
 bool QgsOpenClUtils::sAvailable = false;
-cl::Platform QgsOpenClUtils::sDefaultPlatform = cl::Platform();
-cl::Device QgsOpenClUtils::sActiveDevice = cl::Device();
 QString QgsOpenClUtils::sSourcePath = QString();
 
 
@@ -163,7 +161,21 @@ bool QgsOpenClUtils::enabled()
 
 cl::Device QgsOpenClUtils::activeDevice()
 {
-  return sActiveDevice;
+  return cl::Device::getDefault();
+}
+
+QString QgsOpenClUtils::activePlatformVersion()
+{
+  QString version;
+  if ( cl::Platform::getDefault()() )
+  {
+    std::string platver = cl::Platform::getDefault().getInfo<CL_PLATFORM_VERSION>();
+    if ( platver.find( "OpenCL " ) != std::string::npos )
+    {
+      version = QString::fromStdString( platver.substr( 7 ) ).split( ' ' ).first();
+    }
+  }
+  return version;
 }
 
 void QgsOpenClUtils::storePreferredDevice( const QString deviceId )
@@ -189,6 +201,7 @@ bool QgsOpenClUtils::activate( const QString &preferredDeviceId )
 {
   if ( deviceId( activeDevice() ) == preferredDeviceId )
   {
+    sAvailable = true;
     return false;
   }
   try
@@ -292,8 +305,6 @@ bool QgsOpenClUtils::activate( const QString &preferredDeviceId )
                                    .arg( QString::fromStdString( dev.getInfo<CL_DEVICE_NAME>() ) ),
                                    LOGMESSAGE_TAG, Qgis::Success );
         sAvailable = true;
-        sActiveDevice = dev;
-        sDefaultPlatform = plat;
       }
     }
   }
@@ -491,9 +502,9 @@ cl::Context QgsOpenClUtils::context()
   static std::once_flag contextCreated;
   std::call_once( contextCreated, [ = ]()
   {
-    if ( available() && sDefaultPlatform() && sActiveDevice() )
+    if ( available() && cl::Platform::getDefault()() && cl::Device::getDefault()() )
     {
-      context = cl::Context( sActiveDevice );
+      context = cl::Context( cl::Device::getDefault() );
     }
   } );
   return context;

diff --git a/src/core/qgsopenclutils.h b/src/core/qgsopenclutils.h
@@ -281,8 +281,6 @@ class CORE_EXPORT QgsOpenClUtils
     static void init();
 
     static bool sAvailable;
-    static cl::Device sActiveDevice;
-    static cl::Platform sDefaultPlatform;
     static QLatin1String SETTINGS_GLOBAL_ENABLED_KEY;
     static QLatin1String SETTINGS_DEFAULT_DEVICE_KEY;
     static QString sSourcePath;