[opencl] Fix device selection on start

qgis · Aug 8, 2018 · add3d07 · add3d07
1 parent d846804
commit add3d07
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -1090,13 +1090,16 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
 
     for ( const auto &dev : QgsOpenClUtils::devices( ) )
     {
-      mOpenClDevicesCombo->addItem( QgsOpenClUtils::deviceId( dev ), QgsOpenClUtils::deviceId( dev ) );
+      mOpenClDevicesCombo->addItem( QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Name, dev ), QgsOpenClUtils::deviceId( dev ) );
     }
-    connect( mOpenClDevicesCombo, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), [ = ]( int )
+    // Info updater
+    std::function<void( int )> infoUpdater = [ = ]( int )
     {
       mGPUInfoLabel->setText( QgsOpenClUtils::deviceDescription( mOpenClDevicesCombo->currentData().toString() ) );
-    } );
+    };
+    connect( mOpenClDevicesCombo, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), infoUpdater );
     mOpenClDevicesCombo->setCurrentIndex( mOpenClDevicesCombo->findData( QgsOpenClUtils::deviceId( QgsOpenClUtils::activeDevice() ) ) );
+    infoUpdater( -1 );
   }
   else
   {

diff --git a/src/core/qgsopenclutils.cpp b/src/core/qgsopenclutils.cpp
@@ -149,9 +149,10 @@ QString QgsOpenClUtils::deviceInfo( const Info infoType, cl::Device device )
   }
   catch ( cl::Error &e )
   {
-    QgsMessageLog::logMessage( QObject::tr( "Error %1 getting info for OpenCL device: %2" )
-                               .arg( errorText( e.err() ), QString::fromStdString( e.what() ) ),
-                               LOGMESSAGE_TAG, Qgis::Critical );
+    // This can be a legitimate error when initializing, let's log it quietly
+    QgsDebugMsgLevel( QStringLiteral( "Error %1 getting info for OpenCL device: %2" )
+                      .arg( errorText( e.err() ), QString::fromStdString( e.what() ) ),
+                      4 );
     return QString();
   }
 }
@@ -193,7 +194,7 @@ QString QgsOpenClUtils::deviceId( const cl::Device device )
 
 bool QgsOpenClUtils::activate( const QString preferredDeviceId )
 {
-  if ( preferredDeviceId.isEmpty() || deviceId( activeDevice() ) == preferredDeviceId )
+  if ( deviceId( activeDevice() ) == preferredDeviceId )
   {
     return false;
   }
@@ -275,6 +276,7 @@ bool QgsOpenClUtils::activate( const QString preferredDeviceId )
 QString QgsOpenClUtils::deviceDescription( const cl::Device device )
 {
   return QStringLiteral(
+           "Type: <b>%9</b><br>"
            "Name: <b>%1</b><br>"
            "Vendor: <b>%2</b><br>"
            "Profile: <b>%3</b><br>"
@@ -290,7 +292,8 @@ QString QgsOpenClUtils::deviceDescription( const cl::Device device )
                 QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::ImageSupport, device ),
                 QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Image2dMaxWidth, device ),
                 QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Image2dMaxHeight, device ),
-                QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::MaxMemAllocSize, device ) );
+                QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::MaxMemAllocSize, device ),
+                QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Type, device ) );
 }
 
 QString QgsOpenClUtils::deviceDescription( const QString deviceId )