Fixed problem with re-enabling GPU

buddhi1980 · Jun 7, 2017 · e6f51f1 · e6f51f1
1 parent f87c93b
commit e6f51f1
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 51 deletions.
diff --git a/mandelbulber2/qt/preferences_dialog.cpp b/mandelbulber2/qt/preferences_dialog.cpp
@@ -378,30 +378,34 @@ QList<QPair<QString, QString>> cPreferencesDialog::GetOpenCLDevices()
 #ifdef USE_OPENCL
 void cPreferencesDialog::on_listWidget_gpu_platform_list_currentRowChanged(int index)
 {
-	gOpenCl->openClEngineRenderFractal->Reset();
-	gOpenCl->openClHardware->CreateContext(
-		index, cOpenClDevice::enumOpenClDeviceType(ui->comboBox_gpu_device_type->currentIndex()));
-	gOpenCl->openClHardware->getClDevices();
+	if (index >= 0)
+	{
+		gOpenCl->openClEngineRenderFractal->Reset();
+		gOpenCl->openClHardware->CreateContext(
+			index, cOpenClDevice::enumOpenClDeviceType(ui->comboBox_gpu_device_type->currentIndex()));
+		gOpenCl->openClHardware->getClDevices();
 
-	ui->listWidget_gpu_device_list->clear();
+		ui->listWidget_gpu_device_list->clear();
 
-	QList<QPair<QString, QString>> devices = GetOpenCLDevices();
-	QStringList selectedDevices = gPar->Get<QString>("gpu_device_list").split("|");
-	for (int i = 0; i < devices.size(); i++)
-	{
-		QPair<QString, QString> device = devices.at(i);
-		QListWidgetItem *item = new QListWidgetItem(device.second);
-		item->setData(1, device.first);
-		bool selected = selectedDevices.contains(device.first);
-		ui->listWidget_gpu_device_list->addItem(item);
-		item->setSelected(selected);
+		QList<QPair<QString, QString>> devices = GetOpenCLDevices();
+		QStringList selectedDevices = gPar->Get<QString>("gpu_device_list").split("|");
+		for (int i = 0; i < devices.size(); i++)
+		{
+			QPair<QString, QString> device = devices.at(i);
+			QListWidgetItem *item = new QListWidgetItem(device.second);
+			item->setData(1, device.first);
+			bool selected = selectedDevices.contains(device.first);
+			ui->listWidget_gpu_device_list->addItem(item);
+			item->setSelected(selected);
+		}
 	}
 }
 
 void cPreferencesDialog::on_groupCheck_gpu_enabled_toggled(bool state)
 {
 	if (state)
 	{
+		gOpenCl->openClEngineRenderFractal->Reset();
 		gOpenCl->openClHardware->ListOpenClPlatforms();
 		if (gPar->Get<int>("gpu_platform") >= 0)
 		{

diff --git a/mandelbulber2/src/opencl_hardware.cpp b/mandelbulber2/src/opencl_hardware.cpp
@@ -123,56 +123,64 @@ void cOpenClHardware::ListOpenClPlatforms()
 void cOpenClHardware::CreateContext(
 	int platformIndex, cOpenClDevice::enumOpenClDeviceType deviceType)
 {
-	if (openClAvailable)
+	if (platformIndex >= 0)
 	{
-		devicesInformation.clear();
-		clDeviceWorkers.clear();
-		clDevices.clear();
+		if (openClAvailable)
+		{
+			devicesInformation.clear();
+			clDeviceWorkers.clear();
+			clDevices.clear();
 
-		// platformIndex required
-		// context operates exclusively with (1) platform
-		cl_context_properties cprops[3] = {
-			CL_CONTEXT_PLATFORM, cl_context_properties((clPlatforms[platformIndex])()), 0};
+			// platformIndex required
+			// context operates exclusively with (1) platform
+			cl_context_properties cprops[3] = {
+				CL_CONTEXT_PLATFORM, cl_context_properties((clPlatforms[platformIndex])()), 0};
 
-		if (context) delete context;
-		contextReady = false;
+			if (context) delete context;
+			contextReady = false;
 
-		cl_int err = 0;
+			cl_int err = 0;
 
-		switch (deviceType)
-		{
-			case cOpenClDevice::openClDeviceTypeACC:
-				context = new cl::Context(CL_DEVICE_TYPE_ACCELERATOR, cprops, nullptr, nullptr, &err);
-				break;
-			case cOpenClDevice::openClDeviceTypeALL:
-				context = new cl::Context(CL_DEVICE_TYPE_ALL, cprops, nullptr, nullptr, &err);
-				break;
-			case cOpenClDevice::openClDeviceTypeCPU:
-				context = new cl::Context(CL_DEVICE_TYPE_CPU, cprops, nullptr, nullptr, &err);
-				break;
-			case cOpenClDevice::openClDeviceTypeDEF:
-				context = new cl::Context(CL_DEVICE_TYPE_DEFAULT, cprops, nullptr, nullptr, &err);
-				break;
-			case cOpenClDevice::openClDeviceTypeGPU:
-				context = new cl::Context(CL_DEVICE_TYPE_GPU, cprops, nullptr, nullptr, &err);
-				break;
-		}
+			switch (deviceType)
+			{
+				case cOpenClDevice::openClDeviceTypeACC:
+					context = new cl::Context(CL_DEVICE_TYPE_ACCELERATOR, cprops, nullptr, nullptr, &err);
+					break;
+				case cOpenClDevice::openClDeviceTypeALL:
+					context = new cl::Context(CL_DEVICE_TYPE_ALL, cprops, nullptr, nullptr, &err);
+					break;
+				case cOpenClDevice::openClDeviceTypeCPU:
+					context = new cl::Context(CL_DEVICE_TYPE_CPU, cprops, nullptr, nullptr, &err);
+					break;
+				case cOpenClDevice::openClDeviceTypeDEF:
+					context = new cl::Context(CL_DEVICE_TYPE_DEFAULT, cprops, nullptr, nullptr, &err);
+					break;
+				case cOpenClDevice::openClDeviceTypeGPU:
+					context = new cl::Context(CL_DEVICE_TYPE_GPU, cprops, nullptr, nullptr, &err);
+					break;
+			}
 
-		if (checkErr(err, "Context::Context()"))
-		{
-			contextReady = true;
-			ListOpenClDevices();
+			if (checkErr(err, "Context::Context()"))
+			{
+				contextReady = true;
+				ListOpenClDevices();
+			}
+			else
+			{
+				contextReady = false;
+				cErrorMessage::showMessage(
+					QObject::tr("OpenCL context cannot be created!"), cErrorMessage::errorMessage);
+			}
 		}
 		else
 		{
+			qCritical() << "OpenCl is not available";
 			contextReady = false;
-			cErrorMessage::showMessage(
-				QObject::tr("OpenCL context cannot be created!"), cErrorMessage::errorMessage);
 		}
 	}
 	else
 	{
-		qCritical() << "OpenCl is not available";
+		qCritical() << "OpenCL platform index is negative number!";
 		contextReady = false;
 	}
 }