Kaydet (Commit) ed107094 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Expand tiny misleadingly named 'registerOpenCLKernel' at its only call site

The function did not register any OpenCL kernel;)

Change-Id: Iebba89bc39d3035ff0d39d9cfa8ec72d4ebf217a
üst 55947853
...@@ -75,7 +75,6 @@ public: ...@@ -75,7 +75,6 @@ public:
static bool bIsInited; static bool bIsInited;
static OString maCacheFolder; static OString maCacheFolder;
static void registerOpenCLKernel();
static bool initOpenCLRunEnv( GPUEnv *gpu ); static bool initOpenCLRunEnv( GPUEnv *gpu );
static void releaseOpenCLEnv( GPUEnv *gpuInfo ); static void releaseOpenCLEnv( GPUEnv *gpuInfo );
static bool initOpenCLRunEnv( int argc ); static bool initOpenCLRunEnv( int argc );
......
...@@ -81,12 +81,6 @@ OString getCacheFolder() ...@@ -81,12 +81,6 @@ OString getCacheFolder()
OString OpenCLDevice::maCacheFolder = getCacheFolder(); OString OpenCLDevice::maCacheFolder = getCacheFolder();
void OpenCLDevice::registerOpenCLKernel()
{
if ( !gpuEnv.mnIsUserCreated )
memset( &gpuEnv, 0, sizeof(gpuEnv) );
}
void OpenCLDevice::setKernelEnv( KernelEnv *envInfo ) void OpenCLDevice::setKernelEnv( KernelEnv *envInfo )
{ {
envInfo->mpkContext = gpuEnv.mpContext; envInfo->mpkContext = gpuEnv.mpContext;
...@@ -437,7 +431,9 @@ bool OpenCLDevice::initOpenCLRunEnv( int argc ) ...@@ -437,7 +431,9 @@ bool OpenCLDevice::initOpenCLRunEnv( int argc )
if ( !bIsInited ) if ( !bIsInited )
{ {
registerOpenCLKernel(); if ( !gpuEnv.mnIsUserCreated )
memset( &gpuEnv, 0, sizeof(gpuEnv) );
//initialize devices, context, command_queue //initialize devices, context, command_queue
bool status = initOpenCLRunEnv( &gpuEnv ); bool status = initOpenCLRunEnv( &gpuEnv );
if ( status ) if ( status )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment