I think this is kind of important. So, better to do everything properly from the very beginning. I have a strong preference to what I propose, and I think there is good motivation behind it. OpenCL port was a bare clone of CUDA stuff. And I personally don't remember any of the ocl stuff in 2010. Here is what Git says:
```
~/Work/OpenCV/opencv/modules/ocl> git log . | tail 
Author: salmanulhaq <no@email>
Date:   Thu Jul 7 16:20:43 2011 +0000

    OclMat implementation

commit 64de562db23677b7970fd9225ac23ac9529050b7
Author: salmanulhaq <no@email>
Date:   Thu Jul 7 16:06:26 2011 +0000

    Update OclMat to match GpuMat. Include ref counting, operators, Scalar initialization. Tested for Intel OCL SDK.
```