generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a function to query if global OpenCL context is initialized.

Browse Source
This commit is contained in:
peng xiao 2013-06-13 10:46:12 +08:00
parent 98f6a4a615
commit 5fd724b54a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ocl/include/opencv2/ocl/ocl.hpp
View File

@ -134,6 +134,9 @@ namespace cv
//getDevice also need to be called before this function //getDevice also need to be called before this function
CV_EXPORTS void setDeviceEx(Info &oclinfo, void *ctx, void *qu, int devnum = 0); CV_EXPORTS void setDeviceEx(Info &oclinfo, void *ctx, void *qu, int devnum = 0);
//returns true when global OpenCL context is initialized
CV_EXPORTS bool initialized();
//////////////////////////////// Error handling //////////////////////// //////////////////////////////// Error handling ////////////////////////
CV_EXPORTS void error(const char *error_string, const char *file, const int line, const char *func); CV_EXPORTS void error(const char *error_string, const char *file, const int line, const char *func);
@ -144,7 +147,7 @@ namespace cv
protected: protected:
Context(); Context();
friend class auto_ptr<Context>; friend class auto_ptr<Context>;
friend bool initialized();
private: private:
static auto_ptr<Context> clCxt; static auto_ptr<Context> clCxt;
static int val; static int val;

8
modules/ocl/src/initialization.cpp
View File

@ -917,6 +917,14 @@ namespace cv
int Context::val = 0; int Context::val = 0;
static Mutex cs; static Mutex cs;
static volatile int context_tear_down = 0; static volatile int context_tear_down = 0;
bool initialized()
{
return *((volatile int*)&Context::val) != 0 &&
Context::clCxt->impl->clCmdQueue != NULL&&
Context::clCxt->impl->oclcontext != NULL;
}
Context* Context::getContext() Context* Context::getContext()
{ {
if(*((volatile int*)&val) != 1) if(*((volatile int*)&val) != 1)