Skip to content

Commit

Permalink
obs-qsv11: Remove checks for DX11
Browse files Browse the repository at this point in the history
Since we currently only support DX11_D3D surfaces on Windows, we can
remove the checks for that flag and the flag itself.
  • Loading branch information
RytoEX committed Nov 7, 2024
1 parent bce98b6 commit b854f61
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
2 changes: 0 additions & 2 deletions plugins/obs-qsv11/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions plugins/obs-qsv11/common_utils_windows.cpp
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -127,9 +122,7 @@ mfxStatus Initialize(mfxVersion ver, mfxSession *pSession, mfxFrameAllocator *pm

void Release()
{
#if defined(DX11_D3D)
CleanupHWDevice();
#endif
}

void ReleaseSessionData(void *) {}
Expand Down Expand Up @@ -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

0 comments on commit b854f61

Please sign in to comment.