core/ocl: update dynamic runtime

modules/ocl/src/fft.cpp

@@ -57,7 +57,7 @@ namespace cv { namespace ocl {
 }}
 void cv::ocl::fft_teardown(){}
 #else
-#include "opencv2/ocl/cl_runtime/clamdfft_runtime.hpp"
+#include "opencv2/core/opencl/runtime/opencl_clamdfft.hpp"
 namespace cv
 {
     namespace ocl

modules/ocl/src/gemm.cpp

@@ -72,7 +72,7 @@ void cv::ocl::clBlasTeardown()
 }
 
 #else
-#include "opencv2/ocl/cl_runtime/clamdblas_runtime.hpp"
+#include "opencv2/core/opencl/runtime/opencl_clamdblas.hpp"
 using namespace cv;
 
 static bool clBlasInitialized = false;

modules/ocl/src/precomp.hpp

@@ -58,18 +58,6 @@
 
 #include "cvconfig.h"
 
-#if defined(BUILD_SHARED_LIBS)
-#if defined WIN32 || defined _WIN32 || defined WINCE
-#define CL_RUNTIME_EXPORT __declspec(dllexport)
-#elif defined __GNUC__ && __GNUC__ >= 4
-#define CL_RUNTIME_EXPORT __attribute__ ((visibility ("default")))
-#else
-#define CL_RUNTIME_EXPORT
-#endif
-#else
-#define CL_RUNTIME_EXPORT
-#endif
-
 #include <map>
 #include <iostream>
 #include <limits>

modules/ocl/src/safe_call.hpp

@@ -46,7 +46,7 @@
 #ifndef __OPENCV_OPENCL_SAFE_CALL_HPP__
 #define __OPENCV_OPENCL_SAFE_CALL_HPP__
 
-#include "opencv2/ocl/cl_runtime/cl_runtime.hpp"
+#include "opencv2/core/opencl/runtime/opencl_core.hpp"
 
 #define openCLSafeCall(expr)  ___openCLSafeCall(expr, __FILE__, __LINE__, CV_Func)
 #define openCLVerifyCall(res) ___openCLSafeCall(res, __FILE__, __LINE__, CV_Func)