Add OpenCL version 1.2 query into ocl::Context::supportsFeature().

Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.

modules/ocl/include/opencv2/ocl/ocl.hpp

@@ -155,7 +155,7 @@ namespace cv
             static Context* getContext();
             static void setContext(Info &oclinfo);
 
-            enum {CL_DOUBLE, CL_UNIFIED_MEM};
+            enum {CL_DOUBLE, CL_UNIFIED_MEM, CL_VER_1_2};
             bool supportsFeature(int ftype);
             size_t computeUnits();
             void* oclContext();

modules/ocl/src/initialization.cpp

@@ -130,6 +130,7 @@ namespace cv
             cl_platform_id oclplatform;
             std::vector<cl_device_id> devices;
             std::vector<std::string> devName;
+            std::string clVersion;
 
             cl_context oclcontext;
             cl_command_queue clCmdQueue;
@@ -304,6 +305,7 @@ namespace cv
 
             char deviceName[256];
             int devcienums = 0;
+            char clVersion[256];
             for (unsigned i = 0; i < numPlatforms; ++i)
             {
                 cl_uint numsdev;
@@ -319,6 +321,8 @@ namespace cv
 
                     Info ocltmpinfo;
                     ocltmpinfo.impl->oclplatform = platforms[i];
+                    openCLSafeCall(clGetPlatformInfo(platforms[i], CL_PLATFORM_VERSION, sizeof(clVersion), clVersion, NULL));
+                    ocltmpinfo.impl->clVersion = clVersion;
                     for(unsigned j = 0; j < numsdev; ++j)
                     {
                         ocltmpinfo.impl->devices.push_back(devices[j]);
@@ -997,6 +1001,8 @@ namespace cv
                 return impl->double_support == 1;
             case CL_UNIFIED_MEM:
                 return impl->unified_memory == 1;
+            case CL_VER_1_2:
+                return impl->clVersion.find("OpenCL 1.2") != string::npos;
             default:
                 return false;
             }

modules/ocl/src/mcwutil.cpp

@@ -162,6 +162,8 @@ namespace cv
                 CV_Error(-1, "Image forma is not supported");
                 break;
             }
+            if(Context::getContext()->supportsFeature(Context::CL_VER_1_2))
+            {
 #if CL_VERSION_1_2
                 cl_image_desc desc;
                 desc.image_type       = CL_MEM_OBJECT_IMAGE2D;
@@ -176,6 +178,11 @@ namespace cv
                 desc.num_samples      = 0;
                 texture = clCreateImage((cl_context)mat.clCxt->oclContext(), CL_MEM_READ_WRITE, &format, &desc, NULL, &err);
 #else
+                CV_Error(CV_StsBadFunc, "Non-deprecated image creation API call is not supported."); 
+#endif
+            }
+            else
+            {
                 texture = clCreateImage2D(
                     (cl_context)mat.clCxt->oclContext(),
                     CL_MEM_READ_WRITE,
@@ -185,7 +192,7 @@ namespace cv
                     0,
                     NULL,
                     &err);
-#endif
+            }
             size_t origin[] = { 0, 0, 0 };
             size_t region[] = { mat.cols, mat.rows, 1 };
 
@@ -214,7 +221,6 @@ namespace cv
             openCLSafeCall(err);
             return texture;
         }
-
         void releaseTexture(cl_mem& texture)
         {
             openCLFree(texture);