|
@@ -1,10 +1,8 @@
|
|
|
#include "common_utils.h"
|
|
|
|
|
|
-// ATTENTION: If D3D surfaces are used, DX9_D3D or DX11_D3D must be set in project settings or hardcoded here
|
|
|
+// ATTENTION: If D3D surfaces are used, DX11_D3D must be set in project settings or hardcoded here
|
|
|
|
|
|
-#ifdef DX9_D3D
|
|
|
-#include "common_directx.h"
|
|
|
-#elif DX11_D3D
|
|
|
+#ifdef DX11_D3D
|
|
|
#include "common_directx11.h"
|
|
|
#endif
|
|
|
|
|
@@ -129,7 +127,7 @@ mfxStatus Initialize(mfxVersion ver, mfxSession *pSession, mfxFrameAllocator *pm
|
|
|
|
|
|
void Release()
|
|
|
{
|
|
|
-#if defined(DX9_D3D) || defined(DX11_D3D)
|
|
|
+#if defined(DX11_D3D)
|
|
|
CleanupHWDevice();
|
|
|
#endif
|
|
|
}
|
|
@@ -241,14 +239,14 @@ fail:
|
|
|
#if 0
|
|
|
void ClearYUVSurfaceVMem(mfxMemId memId)
|
|
|
{
|
|
|
-#if defined(DX9_D3D) || defined(DX11_D3D)
|
|
|
+#if defined(DX11_D3D)
|
|
|
ClearYUVSurfaceD3D(memId);
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
void ClearRGBSurfaceVMem(mfxMemId memId)
|
|
|
{
|
|
|
-#if defined(DX9_D3D) || defined(DX11_D3D)
|
|
|
+#if defined(DX11_D3D)
|
|
|
ClearRGBSurfaceD3D(memId);
|
|
|
#endif
|
|
|
}
|