Bläddra i källkod

obs-qsv11: Remove checks for DX11

Since we currently only support DX11_D3D surfaces on Windows, we can
remove the checks for that flag and the flag itself.
Ryan Foster 11 månader sedan
förälder
incheckning
b854f61a1d
2 ändrade filer med 0 tillägg och 13 borttagningar
  1. 0 2
      plugins/obs-qsv11/CMakeLists.txt
  2. 0 11
      plugins/obs-qsv11/common_utils_windows.cpp

+ 0 - 2
plugins/obs-qsv11/CMakeLists.txt

@@ -33,8 +33,6 @@ target_sources(
     QSV_Encoder_Internal.h
 )
 
-target_compile_definitions(obs-qsv11 PRIVATE $<$<PLATFORM_ID:Windows>:DX11_D3D>)
-
 target_compile_options(
   obs-qsv11
   PRIVATE

+ 0 - 11
plugins/obs-qsv11/common_utils_windows.cpp

@@ -1,10 +1,5 @@
 #include "common_utils.h"
-
-// ATTENTION: If D3D surfaces are used, DX11_D3D must be set in project settings or hardcoded here
-
-#ifdef DX11_D3D
 #include "common_directx11.h"
-#endif
 
 #include <util/windows/device-enum.h>
 #include <util/config-file.h>
@@ -127,9 +122,7 @@ mfxStatus Initialize(mfxVersion ver, mfxSession *pSession, mfxFrameAllocator *pm
 
 void Release()
 {
-#if defined(DX11_D3D)
 	CleanupHWDevice();
-#endif
 }
 
 void ReleaseSessionData(void *) {}
@@ -239,15 +232,11 @@ fail:
 #if 0
 void ClearYUVSurfaceVMem(mfxMemId memId)
 {
-#if defined(DX11_D3D)
     ClearYUVSurfaceD3D(memId);
-#endif
 }
 
 void ClearRGBSurfaceVMem(mfxMemId memId)
 {
-#if defined(DX11_D3D)
     ClearRGBSurfaceD3D(memId);
-#endif
 }
 #endif