Merge pull request #1824 from vpisarev:ocl_experiments5

2013-11-20 19:14:39 +04:00
parent 3703c7040a ae8b2cbd68
commit 8d1a8df1a9
39 changed files with 2644 additions and 372 deletions
--- a/modules/ocl/include/opencv2/ocl/private/util.hpp
+++ b/modules/ocl/include/opencv2/ocl/private/util.hpp
@@ -47,6 +47,7 @@
 #define __OPENCV_OCL_PRIVATE_UTIL__

 #include "opencv2/ocl/cl_runtime/cl_runtime.hpp"
+#include "opencv2/core/ocl_genbase.hpp"

 #include "opencv2/ocl.hpp"

@@ -55,13 +56,6 @@ namespace cv
 namespace ocl
 {

-struct ProgramEntry
-{
-    const char* name;
-    const char* programStr;
-    const char* programHash;
-};
-
 inline cl_device_id getClDeviceID(const Context *ctx)
 {
    return *(cl_device_id*)(ctx->getOpenCLDeviceIDPtr());