corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1959165 - Move the MakeCurrent call to a place that makes more sense. r=lsalzman

Browse Source 
The MakeCurrent() call that this patch moves was added in
https://phabricator.services.mozilla.com/D196864 .

I think the WebRenderShaders destructor is a more reasonable
place for this call; WebRenderShaders already stores the GLContext.

Differential Revision: https://phabricator.services.mozilla.com/D244782
This commit is contained in:
Markus Stange
2025-04-08 16:37:59 +00:00
parent c36db8f9e1
commit f2bd02ddbc
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/webrender_bindings/RenderThread.cpp
View File

@@ -1459,12 +1459,7 @@ void RenderThread::ClearSingletonGL() {
mProgramsForCompositorOGL->Clear(); mProgramsForCompositorOGL->Clear();
mProgramsForCompositorOGL = nullptr; mProgramsForCompositorOGL = nullptr;
} }
if (mShaders) { mShaders = nullptr;
if (mSingletonGL) {
mSingletonGL->MakeCurrent();
}
mShaders = nullptr;
}
mSingletonGL = nullptr; mSingletonGL = nullptr;
} }
@@ -1547,6 +1542,7 @@ WebRenderShaders::WebRenderShaders(gl::GLContext* gl,
} }
WebRenderShaders::~WebRenderShaders() { WebRenderShaders::~WebRenderShaders() {
mGL->MakeCurrent();
wr_shaders_delete(mShaders, mGL.get()); wr_shaders_delete(mShaders, mGL.get());
} }