Merge pull request #13240 from dbudniko:dbudniko/gapi_gpu_to_ocl_renaming
authorDmitry Budnikov <Dmitry.Budnikov@intel.com>
Thu, 29 Nov 2018 13:29:11 +0000 (16:29 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 29 Nov 2018 13:29:11 +0000 (16:29 +0300)
commit6374b99a1a60190b7aff68fa5a1f1755217cf630
tree2cfd2cf518fd77acdd0f033e0f83e6d8495eb070
parent4fb9bce79f50495b69a025b0923e1ce124580148
Merge pull request #13240 from dbudniko:dbudniko/gapi_gpu_to_ocl_renaming

G-API rename GPU backend to OCL backend (#13240)

* renaming draft

* inline namespace instead non-safe define

* more back compatibility

* Updates after review from Dmitry
21 files changed:
modules/gapi/CMakeLists.txt
modules/gapi/include/opencv2/gapi/gpu/core.hpp
modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp
modules/gapi/include/opencv2/gapi/gpu/imgproc.hpp
modules/gapi/include/opencv2/gapi/ocl/core.hpp [new file with mode: 0644]
modules/gapi/include/opencv2/gapi/ocl/goclkernel.hpp [new file with mode: 0644]
modules/gapi/include/opencv2/gapi/ocl/imgproc.hpp [new file with mode: 0644]
modules/gapi/perf/gpu/gapi_core_perf_tests_gpu.cpp
modules/gapi/perf/gpu/gapi_imgproc_perf_tests_gpu.cpp
modules/gapi/perf/perf_precomp.hpp
modules/gapi/src/backends/ocl/goclbackend.cpp [moved from modules/gapi/src/backends/gpu/ggpubackend.cpp with 87% similarity]
modules/gapi/src/backends/ocl/goclbackend.hpp [moved from modules/gapi/src/backends/gpu/ggpubackend.hpp with 77% similarity]
modules/gapi/src/backends/ocl/goclcore.cpp [moved from modules/gapi/src/backends/gpu/ggpucore.cpp with 67% similarity]
modules/gapi/src/backends/ocl/goclcore.hpp [moved from modules/gapi/src/backends/gpu/ggpucore.hpp with 65% similarity]
modules/gapi/src/backends/ocl/goclimgproc.cpp [moved from modules/gapi/src/backends/gpu/ggpuimgproc.cpp with 79% similarity]
modules/gapi/src/backends/ocl/goclimgproc.hpp [moved from modules/gapi/src/backends/gpu/ggpuimgproc.hpp with 64% similarity]
modules/gapi/src/backends/ocl/goclkernel.cpp [moved from modules/gapi/src/backends/gpu/ggpukernel.cpp with 58% similarity]
modules/gapi/test/gpu/gapi_core_tests_gpu.cpp
modules/gapi/test/gpu/gapi_imgproc_tests_gpu.cpp
modules/gapi/test/gpu/gapi_operators_tests_gpu.cpp
modules/gapi/test/test_precomp.hpp