Skip to content

Commit 9eb5f1c

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. Pick-to: 118-based Change-Id: Iec8c8e5495026162421f209aa1fcd092ff7b9634 Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/583052 Reviewed-by: Peter Varga <[email protected]>
1 parent 317dd08 commit 9eb5f1c

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
@@ -293,13 +293,15 @@ void SetupGLDisplayManagerEGL(const GPUInfo& gpu_info,
293293
GpuInit::GpuInit() = default;
294294

295295
GpuInit::~GpuInit() {
296+
#if BUILDFLAG(IS_WIN)
296297
if (gl::GetGLImplementation() != gl::kGLImplementationDisabled) {
297298
auto *gl_display = gl::init::GetOrInitializeGLOneOffPlatformImplementation(
298299
false, false, false, gl::GpuPreference::kDefault);
299300
if (gl_display) {
300301
gl::init::ShutdownGL(gl_display, false);
301302
}
302303
}
304+
#endif // BUILDFLAG(IS_WIN)
303305

304306
StopForceDiscreteGPU();
305307
}

0 commit comments

Comments
 (0)