Bug 1696105 - Remove aBridge argument from RenderThread::HandleDeviceReset() r=aosmond

Differential Revision: https://phabricator.services.mozilla.com/D107033
This commit is contained in:
sotaro 2021-03-03 10:29:40 +00:00
Родитель 0ab4a7dcc5
Коммит 66df971f6f
4 изменённых файлов: 5 добавлений и 9 удалений

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

@ -500,7 +500,7 @@ bool RenderCompositorANGLE::BeginFrame() {
if (!mSyncObject->Synchronize(/* aFallible */ true)) {
// It's timeout or other error. Handle the device-reset here.
RenderThread::Get()->HandleDeviceReset(
"SyncObject", nullptr, LOCAL_GL_UNKNOWN_CONTEXT_RESET_ARB);
"SyncObject", LOCAL_GL_UNKNOWN_CONTEXT_RESET_ARB);
return false;
}
}

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

@ -802,9 +802,7 @@ static DeviceResetReason GLenumToResetReason(GLenum aReason) {
}
#endif
void RenderThread::HandleDeviceReset(const char* aWhere,
layers::CompositorBridgeParent* aBridge,
GLenum aReason) {
void RenderThread::HandleDeviceReset(const char* aWhere, GLenum aReason) {
MOZ_ASSERT(IsInRenderThread());
if (mHandlingDeviceReset) {
@ -861,7 +859,7 @@ void RenderThread::SimulateDeviceReset() {
// When this function is called GPUProcessManager::SimulateDeviceReset()
// already triggers destroying all CompositorSessions before re-creating
// them.
HandleDeviceReset("SimulateDeviceReset", nullptr, LOCAL_GL_NO_ERROR);
HandleDeviceReset("SimulateDeviceReset", LOCAL_GL_NO_ERROR);
}
}

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

@ -262,9 +262,7 @@ class RenderThread final {
void ClearSharedSurfacePool();
/// Can only be called from the render thread.
void HandleDeviceReset(const char* aWhere,
layers::CompositorBridgeParent* aBridge,
GLenum aReason);
void HandleDeviceReset(const char* aWhere, GLenum aReason);
/// Can only be called from the render thread.
bool IsHandlingDeviceReset();
/// Can be called from any thread.

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

@ -255,7 +255,7 @@ void RendererOGL::CheckGraphicsResetStatus(const char* aCaller, bool aForce) {
if (mCompositor) {
auto reason = mCompositor->IsContextLost(aForce);
if (reason != LOCAL_GL_NO_ERROR) {
RenderThread::Get()->HandleDeviceReset(aCaller, mBridge, reason);
RenderThread::Get()->HandleDeviceReset(aCaller, reason);
}
}
}