potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

optimizing branch judgment

Browse Source
This commit is contained in:
WangGuobao
2019-03-15 12:59:00 +08:00
parent 9c2dcdaa07
commit 88b72b870e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/directx.cpp
+10 -9
View File
@@ -1263,15 +1263,15 @@ void convertToD3D11Texture2D(InputArray src, ID3D11Texture2D* pD3D11Texture2D)
#else
bool useCLNVEXT = __OpenCLinitializeD3D11();
if(!useCLNVEXT){
__convertToD3D11Texture2DKHR(src,pD3D11Texture2D);
}
#ifdef HAVE_OPENCL_D3D11_NV
else
{
if(useCLNVEXT){
__convertToD3D11Texture2DNV(src,pD3D11Texture2D);
}
else
#endif
{
__convertToD3D11Texture2DKHR(src,pD3D11Texture2D);
}
#endif
}
@@ -1285,15 +1285,16 @@ void convertFromD3D11Texture2D(ID3D11Texture2D* pD3D11Texture2D, OutputArray dst
#else
bool useCLNVEXT = __OpenCLinitializeD3D11();
if(!useCLNVEXT){
__convertFromD3D11Texture2DKHR(pD3D11Texture2D,dst);
}
#ifdef HAVE_OPENCL_D3D11_NV
else
if(useCLNVEXT)
{
__convertFromD3D11Texture2DNV(pD3D11Texture2D,dst);
}
else
#endif
{
__convertFromD3D11Texture2DKHR(pD3D11Texture2D,dst);
}
#endif
}