Bug 1573616. Stop using null desc for WARP device. r=lsalzman

This makes us use the actual adapter description instead of a null one.
This fixes the problem of a mismatch being detected in ContentAdapterIsParentAdapter which
is using D3D11Checks::GetDxgiDesc to determine the adapter.

Differential Revision: https://phabricator.services.mozilla.com/D41804

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jeff Muizelaar 2019-08-13 20:09:34 +00:00
Родитель 7c2c13bdfa
Коммит 2f622224e3
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -655,8 +655,8 @@ void DeviceManagerDx::CreateWARPCompositorDevice() {
textureSharingWorks = D3D11Checks::DoesTextureSharingWork(device); textureSharingWorks = D3D11Checks::DoesTextureSharingWork(device);
} }
DxgiAdapterDesc nullAdapter; DXGI_ADAPTER_DESC desc;
PodZero(&nullAdapter); D3D11Checks::GetDxgiDesc(device, &desc);
int featureLevel = device->GetFeatureLevel(); int featureLevel = device->GetFeatureLevel();
@ -666,9 +666,9 @@ void DeviceManagerDx::CreateWARPCompositorDevice() {
mCompositorDevice = device; mCompositorDevice = device;
int32_t sequenceNumber = GetNextDeviceCounter(); int32_t sequenceNumber = GetNextDeviceCounter();
mDeviceStatus = mDeviceStatus = Some(D3D11DeviceStatus(
Some(D3D11DeviceStatus(true, textureSharingWorks, featureLevel, true, textureSharingWorks, featureLevel, DxgiAdapterDesc::From(desc),
nullAdapter, sequenceNumber, formatOptions)); sequenceNumber, formatOptions));
} }
mCompositorDevice->SetExceptionMode(0); mCompositorDevice->SetExceptionMode(0);