From b854f61a1d56162366e41772c975869d366758ff Mon Sep 17 00:00:00 2001
From: Ryan Foster <ryan@obsproject.com>
Date: Fri, 1 Nov 2024 16:57:02 -0400
Subject: [PATCH] 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.
---
 plugins/obs-qsv11/CMakeLists.txt           |  2 --
 plugins/obs-qsv11/common_utils_windows.cpp | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/plugins/obs-qsv11/CMakeLists.txt b/plugins/obs-qsv11/CMakeLists.txt
index b590a58e0a3741..85b150f6d2ece4 100644
--- a/plugins/obs-qsv11/CMakeLists.txt
+++ b/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
diff --git a/plugins/obs-qsv11/common_utils_windows.cpp b/plugins/obs-qsv11/common_utils_windows.cpp
index 57a92cad4fa903..da950ca6a0d70c 100644
--- a/plugins/obs-qsv11/common_utils_windows.cpp
+++ b/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 @@ void check_adapters(struct adapter_info *adapters, size_t *adapter_count)
 #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