Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset e82fc4bb4cc4 (bug 1298324) for windows build bustage a=backout

Browse Source 
CLOSED TREE

--HG--
extra : amend_source : b780f41c130ad5be13c451b4bcbc2b8cfd5570a1
This commit is contained in:
Wes Kocher 2016-08-26 14:07:32 -07:00
parent c686d38861
commit 493b1533ea
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/ipc/GPUParent.cpp
View File

@ -170,12 +170,8 @@ GPUParent::RecvGetDeviceStatus(GPUDeviceData* aOut)
#if defined(XP_WIN)
if (DeviceManagerDx* dm = DeviceManagerDx::Get()) {
D3D11DeviceStatus deviceStatus;
dm->ExportDeviceInfo(&deviceStatus);
aOut->gpuDevice() = deviceStatus;
dm->ExportDeviceInfo(&aOut->d3d11Device());
}
#else
aOut->gpuDevice() = null_t();
#endif
return true;

8
gfx/ipc/GraphicsMessages.ipdlh
View File

@ -54,18 +54,12 @@ union FeatureChange
FeatureFailure;
};
union GPUDeviceStatus
{
null_t;
D3D11DeviceStatus;
};
struct GPUDeviceData
{
FeatureChange d3d11Compositing;
FeatureChange d3d9Compositing;
FeatureChange oglCompositing;
GPUDeviceStatus gpuDevice;
D3D11DeviceStatus d3d11Device;
};
union GfxVarValue

2
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -2004,7 +2004,7 @@ gfxWindowsPlatform::ImportGPUDeviceData(const mozilla::gfx::GPUDeviceData& aData
DeviceManagerDx* dm = DeviceManagerDx::Get();
if (gfxConfig::IsEnabled(Feature::D3D11_COMPOSITING)) {
dm->ImportDeviceInfo(aData.d3d11Device().get_D3D11DeviceStatus());
dm->ImportDeviceInfo(aData.d3d11Device());
} else {
// There should be no devices, so this just takes away the device status.
dm->ResetDevices();