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

pull/5340/head
Alexander Alekhin 10 years ago
parent 7213e5f68a
commit 1a8d7f9587
  1. 8
      modules/core/src/precomp.hpp

@ -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
} }
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

Loading…
Cancel
Save