[opencl] Fix device selection on start

elpaso · elpaso · commit add3d074b8e4 · 2018-08-08T09:22:28.000+02:00
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 )

Original file line number	Diff line number	Diff line change
`@@ -1090,13 +1090,16 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti`
`1090`	`1090`
`1091`	`1091`	`for ( const auto &dev : QgsOpenClUtils::devices( ) )`
`1092`	`1092`	`{`
`1093`		`- mOpenClDevicesCombo->addItem( QgsOpenClUtils::deviceId( dev ), QgsOpenClUtils::deviceId( dev ) );`
	`1093`	`+ mOpenClDevicesCombo->addItem( QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Name, dev ), QgsOpenClUtils::deviceId( dev ) );`
`1094`	`1094`	`}`
`1095`		`- connect( mOpenClDevicesCombo, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), [ = ]( int )`
	`1095`	`+ // Info updater`
	`1096`	`+ std::function<void( int )> infoUpdater = [ = ]( int )`
`1096`	`1097`	`{`
`1097`	`1098`	`mGPUInfoLabel->setText( QgsOpenClUtils::deviceDescription( mOpenClDevicesCombo->currentData().toString() ) );`
`1098`		`- } );`
	`1099`	`+ };`
	`1100`	`+ connect( mOpenClDevicesCombo, qgis::overload< int >::of( &QComboBox::currentIndexChanged ), infoUpdater );`
`1099`	`1101`	`mOpenClDevicesCombo->setCurrentIndex( mOpenClDevicesCombo->findData( QgsOpenClUtils::deviceId( QgsOpenClUtils::activeDevice() ) ) );`
	`1102`	`+ infoUpdater( -1 );`
`1100`	`1103`	`}`
`1101`	`1104`	`else`
`1102`	`1105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -149,9 +149,10 @@ QString QgsOpenClUtils::deviceInfo( const Info infoType, cl::Device device )`
`149`	`149`	`}`
`150`	`150`	`catch ( cl::Error &e )`
`151`	`151`	`{`
`152`		`- QgsMessageLog::logMessage( QObject::tr( "Error %1 getting info for OpenCL device: %2" )`
`153`		`- .arg( errorText( e.err() ), QString::fromStdString( e.what() ) ),`
`154`		`- LOGMESSAGE_TAG, Qgis::Critical );`
	`152`	`+ // This can be a legitimate error when initializing, let's log it quietly`
	`153`	`+ QgsDebugMsgLevel( QStringLiteral( "Error %1 getting info for OpenCL device: %2" )`
	`154`	`+ .arg( errorText( e.err() ), QString::fromStdString( e.what() ) ),`
	`155`	`+ 4 );`
`155`	`156`	`return QString();`
`156`	`157`	`}`
`157`	`158`	`}`
`@@ -193,7 +194,7 @@ QString QgsOpenClUtils::deviceId( const cl::Device device )`
`193`	`194`
`194`	`195`	`bool QgsOpenClUtils::activate( const QString preferredDeviceId )`
`195`	`196`	`{`
`196`		`- if ( preferredDeviceId.isEmpty() \|\| deviceId( activeDevice() ) == preferredDeviceId )`
	`197`	`+ if ( deviceId( activeDevice() ) == preferredDeviceId )`
`197`	`198`	`{`
`198`	`199`	`return false;`
`199`	`200`	`}`
`@@ -275,6 +276,7 @@ bool QgsOpenClUtils::activate( const QString preferredDeviceId )`
`275`	`276`	`QString QgsOpenClUtils::deviceDescription( const cl::Device device )`
`276`	`277`	`{`
`277`	`278`	`return QStringLiteral(`
	`279`	`+ "Type: <b>%9</b><br>"`
`278`	`280`	`"Name: <b>%1</b><br>"`
`279`	`281`	`"Vendor: <b>%2</b><br>"`
`280`	`282`	`"Profile: <b>%3</b><br>"`
`@@ -290,7 +292,8 @@ QString QgsOpenClUtils::deviceDescription( const cl::Device device )`
`290`	`292`	`QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::ImageSupport, device ),`
`291`	`293`	`QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Image2dMaxWidth, device ),`
`292`	`294`	`QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Image2dMaxHeight, device ),`
`293`		`- QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::MaxMemAllocSize, device ) );`
	`295`	`+ QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::MaxMemAllocSize, device ),`
	`296`	`+ QgsOpenClUtils::deviceInfo( QgsOpenClUtils::Info::Type, device ) );`
`294`	`297`	`}`
`295`	`298`
`296`	`299`	`QString QgsOpenClUtils::deviceDescription( const QString deviceId )`