Skip to content
Permalink
Browse files

Removed context from utils

  • Loading branch information
elpaso committed Aug 8, 2018
1 parent 9068fe4 commit ff1b6c29bc266d155748ecf1c226fb7bb4626d36
Showing with 1 addition and 10 deletions.
  1. +1 −0 src/analysis/raster/qgsninecellfilter.cpp
  2. +0 −5 src/core/qgsopenclutils.cpp
  3. +0 −5 src/core/qgsopenclutils.h
@@ -20,6 +20,7 @@
#include "cpl_string.h"
#include "qgsfeedback.h"
#include "qgsogrutils.h"
#include "qgsmessagelog.h"
#include <QFile>
#include <QDebug>
#include <QFileInfo>
@@ -24,7 +24,6 @@

QLatin1String QgsOpenClUtils::SETTINGS_KEY = QLatin1Literal( "OpenClEnabled" );
QLatin1String QgsOpenClUtils::LOGMESSAGE_TAG = QLatin1Literal( "OpenCL" );
std::unique_ptr<cl::Context> QgsOpenClUtils::sContext = nullptr;
bool QgsOpenClUtils::sAvailable = false;


@@ -71,10 +70,6 @@ void QgsOpenClUtils::init()
else
{
cl::Device::setDefault( dev );
std::vector<cl::Device> devices;
devices.push_back( cl::Device::getDefault() );
sContext = qgis::make_unique<cl::Context>( devices );
cl::Context::setDefault( *sContext );
sAvailable = true;
}
}
@@ -27,9 +27,6 @@
#include "qgis_core.h"
#include "qgis.h"

//TODO: remove
#include "qgsmessagelog.h"


/**
* \ingroup core
@@ -52,8 +49,6 @@ class CORE_EXPORT QgsOpenClUtils
QgsOpenClUtils();
static void init();
static bool sAvailable;
// TODO: check if this is needed
static std::unique_ptr<cl::Context> sContext;
static QLatin1String SETTINGS_KEY;

};

0 comments on commit ff1b6c2

Please sign in to comment.
You can’t perform that action at this time.