Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4d2c65de6f51 (bug 1322741) for causing e10s reftest failures on windows

Browse Source 
--HG--
extra : rebase_source : 76d575aa3d18f4d6d29a9f4dfeeff4a2be72bf6d
This commit is contained in:
Carsten "Tomcat" Book 2017-01-05 13:49:30 +01:00
parent b9b4ce1ca0
commit 1d4eeea3f0
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/layers/client/ClientLayerManager.cpp
View File

@ -651,8 +651,7 @@ ClientLayerManager::ForwardTransaction(bool aScheduleComposite)
// Skip the synchronization for buffer since we also skip the painting during
// device-reset status.
if (!gfxPlatform::GetPlatform()->DidRenderingDeviceReset()) {
if (mForwarder->GetSyncObject() &&
mForwarder->GetSyncObject()->IsSyncObjectValid()) {
if (mForwarder->GetSyncObject()) {
mForwarder->GetSyncObject()->FinalizeFrame();
}
}

1
gfx/layers/client/TextureClient.h
View File

@ -111,7 +111,6 @@ public:
virtual SyncType GetSyncType() = 0;
virtual void FinalizeFrame() = 0;
virtual bool IsSyncObjectValid() = 0;
protected:
SyncObject() { }

15
gfx/layers/d3d11/TextureD3D11.cpp
View File

@ -1198,7 +1198,6 @@ CompositingRenderTargetD3D11::GetSize() const
SyncObjectD3D11::SyncObjectD3D11(SyncHandle aSyncHandle)
: mSyncHandle(aSyncHandle)
{
Init();
}
bool
@ -1209,10 +1208,6 @@ SyncObjectD3D11::Init()
}
RefPtr<ID3D11Device> device = DeviceManagerDx::Get()->GetContentDevice();
if (!device) {
return false;
}
mD3D11Device = device;
HRESULT hr = device->OpenSharedResource(
mSyncHandle,
@ -1244,16 +1239,6 @@ SyncObjectD3D11::RegisterTexture(ID3D11Texture2D* aTexture)
mD3D11SyncedTextures.push_back(aTexture);
}
bool
SyncObjectD3D11::IsSyncObjectValid()
{
RefPtr<ID3D11Device> dev = DeviceManagerDx::Get()->GetContentDevice();
if (!dev || (dev != mD3D11Device)) {
return false;
}
return true;
}
void
SyncObjectD3D11::FinalizeFrame()
{

2
gfx/layers/d3d11/TextureD3D11.h
View File

@ -415,7 +415,6 @@ class SyncObjectD3D11 : public SyncObject
public:
explicit SyncObjectD3D11(SyncHandle aSyncHandle);
virtual void FinalizeFrame();
virtual bool IsSyncObjectValid();
virtual SyncType GetSyncType() { return SyncType::D3D11; }
@ -426,7 +425,6 @@ private:
private:
SyncHandle mSyncHandle;
RefPtr<ID3D11Device> mD3D11Device;
RefPtr<ID3D11Texture2D> mD3D11Texture;
RefPtr<IDXGIKeyedMutex> mKeyedMutex;
std::vector<ID3D11Texture2D*> mD3D11SyncedTextures;