Skip to content

O
opencv
Commit 1a8d7f95 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

ocl: temporary restore OpenCL tls data (ocl.cpp without fix)

parent 7213e5f6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/core/src/precomp.hpp
View file @ 1a8d7f95
...@@ -265,9 +265,9 @@ struct ImplCollector ...@@ -265,9 +265,9 @@ struct ImplCollector
struct CoreTLSData struct CoreTLSData
{ {
CoreTLSData() : CoreTLSData() :
#ifdef HAVE_OPENCL //#ifdef HAVE_OPENCL
device(0), useOpenCL(-1), device(0), useOpenCL(-1),
#endif //#endif
useIPP(-1) useIPP(-1)
{ {
#ifdef HAVE_TEGRA_OPTIMIZATION #ifdef HAVE_TEGRA_OPTIMIZATION
...@@ -276,11 +276,11 @@ struct CoreTLSData ...@@ -276,11 +276,11 @@ struct CoreTLSData
} }
RNG rng; RNG rng;
#ifdef HAVE_OPENCL //#ifdef HAVE_OPENCL
int device; int device;
ocl::Queue oclQueue; ocl::Queue oclQueue;
int useOpenCL; // 1 - use, 0 - do not use, -1 - auto/not initialized int useOpenCL; // 1 - use, 0 - do not use, -1 - auto/not initialized
#endif //#endif
int useIPP; // 1 - use, 0 - do not use, -1 - auto/not initialized int useIPP; // 1 - use, 0 - do not use, -1 - auto/not initialized
#ifdef HAVE_TEGRA_OPTIMIZATION #ifdef HAVE_TEGRA_OPTIMIZATION
int useTegra; // 1 - use, 0 - do not use, -1 - auto/not initialized int useTegra; // 1 - use, 0 - do not use, -1 - auto/not initialized
......
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