mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix warning:defined but not used

Browse Source
This commit is contained in:
WangGuobao 2019-03-15 09:55:53 +08:00
parent d9cc42a153
commit 7ab3537cd0
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/core/src/directx.cpp
View File

@ -778,7 +778,9 @@ static bool __OpenCLinitializeD3D11()
cl_platform_id platform = (cl_platform_id)Platform::getDefault().ptr(); cl_platform_id platform = (cl_platform_id)Platform::getDefault().ptr();
bool useCLNVEXT = false; bool useCLNVEXT = false;
#ifdef HAVE_OPENCL_D3D11_NV #ifndef HAVE_OPENCL_D3D11_NV
NO_OPENCL_D3D11_NV_SUPPORT_ERROR
#else
if (initializedPlatform != platform) if (initializedPlatform != platform)
{ {
clCreateFromD3D11Texture2DNV = (clCreateFromD3D11Texture2DNV_fn) clCreateFromD3D11Texture2DNV = (clCreateFromD3D11Texture2DNV_fn)
@ -870,14 +872,9 @@ bool ocl_convert_bgr_to_nv12(
namespace directx { namespace directx {
#if defined(HAVE_OPENCL)
static void __convertToD3D11Texture2DKHR(InputArray src, ID3D11Texture2D* pD3D11Texture2D) static void __convertToD3D11Texture2DKHR(InputArray src, ID3D11Texture2D* pD3D11Texture2D)
{ {
CV_UNUSED(src); CV_UNUSED(pD3D11Texture2D);
#if !defined(HAVE_DIRECTX)
NO_DIRECTX_SUPPORT_ERROR;
#elif !defined(HAVE_OPENCL)
NO_OPENCL_SUPPORT_ERROR;
#else
D3D11_TEXTURE2D_DESC desc = { 0 }; D3D11_TEXTURE2D_DESC desc = { 0 };
pD3D11Texture2D->GetDesc(&desc); pD3D11Texture2D->GetDesc(&desc);
@ -969,15 +966,12 @@ static void __convertToD3D11Texture2DKHR(InputArray src, ID3D11Texture2D* pD3D11
CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed"); CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed");
} }
#endif #endif
#endif
} }
#endif
#if defined(HAVE_OPENCL_D3D11_NV)
static void __convertToD3D11Texture2DNV(InputArray src, ID3D11Texture2D* pD3D11Texture2D) static void __convertToD3D11Texture2DNV(InputArray src, ID3D11Texture2D* pD3D11Texture2D)
{ {
CV_UNUSED(src); CV_UNUSED(pD3D11Texture2D);
#if !defined(HAVE_OPENCL_D3D11_NV)
NO_OPENCL_D3D11_NV_SUPPORT_ERROR;
#else
D3D11_TEXTURE2D_DESC desc = { 0 }; D3D11_TEXTURE2D_DESC desc = { 0 };
pD3D11Texture2D->GetDesc(&desc); pD3D11Texture2D->GetDesc(&desc);
@ -1068,18 +1062,12 @@ static void __convertToD3D11Texture2DNV(InputArray src, ID3D11Texture2D* pD3D11T
CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed"); CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed");
} }
#endif #endif
#endif // HAVE_OPENCL_D3D11_NV
} }
#endif
#if defined(HAVE_OPENCL)
static void __convertFromD3D11Texture2DKHR(ID3D11Texture2D* pD3D11Texture2D, OutputArray dst) static void __convertFromD3D11Texture2DKHR(ID3D11Texture2D* pD3D11Texture2D, OutputArray dst)
{ {
CV_UNUSED(pD3D11Texture2D); CV_UNUSED(dst);
#if !defined(HAVE_DIRECTX)
NO_DIRECTX_SUPPORT_ERROR;
#elif !defined(HAVE_OPENCL)
NO_OPENCL_SUPPORT_ERROR;
#else
D3D11_TEXTURE2D_DESC desc = { 0 }; D3D11_TEXTURE2D_DESC desc = { 0 };
pD3D11Texture2D->GetDesc(&desc); pD3D11Texture2D->GetDesc(&desc);
@ -1168,15 +1156,12 @@ static void __convertFromD3D11Texture2DKHR(ID3D11Texture2D* pD3D11Texture2D, Out
CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed"); CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed");
} }
#endif #endif
#endif
} }
#endif
#if defined(HAVE_OPENCL_D3D11_NV)
static void __convertFromD3D11Texture2DNV(ID3D11Texture2D* pD3D11Texture2D, OutputArray dst) static void __convertFromD3D11Texture2DNV(ID3D11Texture2D* pD3D11Texture2D, OutputArray dst)
{ {
CV_UNUSED(pD3D11Texture2D); CV_UNUSED(dst);
#if !defined(HAVE_OPENCL_D3D11_NV)
NO_OPENCL_D3D11_NV_SUPPORT_ERROR;
#else
D3D11_TEXTURE2D_DESC desc = { 0 }; D3D11_TEXTURE2D_DESC desc = { 0 };
pD3D11Texture2D->GetDesc(&desc); pD3D11Texture2D->GetDesc(&desc);
@ -1265,9 +1250,8 @@ static void __convertFromD3D11Texture2DNV(ID3D11Texture2D* pD3D11Texture2D, Outp
CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed"); CV_Error(cv::Error::OpenCLApiCallError, "OpenCL: clReleaseMem failed");
} }
#endif #endif
#endif // HAVE_OPENCL_D3D11_NV
} }
#endif
void convertToD3D11Texture2D(InputArray src, ID3D11Texture2D* pD3D11Texture2D) void convertToD3D11Texture2D(InputArray src, ID3D11Texture2D* pD3D11Texture2D)
{ {