From 7074463d0ffce743e52f5d5490f91474f6580474 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 30 Aug 2024 23:03:36 -0500 Subject: [PATCH] Remove FL 11.0 restriction for D3D11VA --- app/streaming/video/ffmpeg-renderers/d3d11va.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/d3d11va.cpp b/app/streaming/video/ffmpeg-renderers/d3d11va.cpp index 13ea740f..585cbb9f 100644 --- a/app/streaming/video/ffmpeg-renderers/d3d11va.cpp +++ b/app/streaming/video/ffmpeg-renderers/d3d11va.cpp @@ -155,7 +155,10 @@ D3D11VARenderer::~D3D11VARenderer() bool D3D11VARenderer::createDeviceByAdapterIndex(int adapterIndex, bool* adapterNotFound) { - const D3D_FEATURE_LEVEL supportedFeatureLevels[] = { D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0 }; + const D3D_FEATURE_LEVEL supportedFeatureLevels[] = { D3D_FEATURE_LEVEL_11_1, + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0 }; bool success = false; ComPtr adapter; DXGI_ADAPTER_DESC1 adapterDesc; @@ -231,13 +234,6 @@ bool D3D11VARenderer::createDeviceByAdapterIndex(int adapterIndex, bool* adapter hr); goto Exit; } - else if (adapterDesc.VendorId == 0x8086 && featureLevel <= D3D_FEATURE_LEVEL_11_0 && !qEnvironmentVariableIntValue("D3D11VA_ENABLED")) { - SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, - "Avoiding D3D11VA on old pre-FL11.1 Intel GPU. Set D3D11VA_ENABLED=1 to override."); - m_DeviceContext.Reset(); - m_Device.Reset(); - goto Exit; - } else if (featureLevel >= D3D_FEATURE_LEVEL_11_0) { // Remember that we found a non-software D3D11 devices with support for // feature level 11.0 or later (Fermi, Terascale 2, or Ivy Bridge and later) @@ -823,7 +819,6 @@ void D3D11VARenderer::renderVideo(AVFrame* frame) return; } - // Ensure decoding operations have completed using a dummy fence. // This is not necessary on modern GPU drivers, but it is required // on some older GPU drivers that don't properly synchronize the