Skip to content

Commit de88aea

Browse files
author
Kaloyan Chehlarski
committed
FIXUP: "Shut GL down on process exit to silence Direct3D11 warnings"
Speculative fix for CI failures on Ubuntu. The GL shutdown only matters on Windows (so far), so it's now placed inside #if guards. Change-Id: Iec8c8e5495026162421f209aa1fcd092ff7b9634 Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/583052 Reviewed-by: Peter Varga <[email protected]> (cherry picked from commit 9eb5f1c) Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/583077 Reviewed-by: Qt Cherry-pick Bot <[email protected]>
1 parent ed249a2 commit de88aea

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

chromium/gpu/ipc/service/gpu_init.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,15 @@ void SetupGLDisplayManagerEGL(const GPUInfo& gpu_info,
296296
GpuInit::GpuInit() = default;
297297

298298
GpuInit::~GpuInit() {
299+
#if BUILDFLAG(IS_WIN)
299300
if (gl::GetGLImplementation() != gl::kGLImplementationDisabled) {
300301
auto *gl_display = gl::init::GetOrInitializeGLOneOffPlatformImplementation(
301302
false, false, false, gl::GpuPreference::kDefault);
302303
if (gl_display) {
303304
gl::init::ShutdownGL(gl_display, false);
304305
}
305306
}
307+
#endif // BUILDFLAG(IS_WIN)
306308

307309
StopForceDiscreteGPU();
308310
}

0 commit comments

Comments
 (0)