From 928305487e507e27c02b03a0f0557104379dd7ad Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nical@fastmail.com>
Date: Thu, 3 Jul 2025 15:50:48 +0000
Subject: [PATCH] Bug 1973975 - Ensure that glMakeCurrent is called when
 rendering without presenting. r=gfx-reviewers,aosmond a=pascalc

Differential Revision: https://phabricator.services.mozilla.com/D255987
---
 gfx/webrender_bindings/RendererOGL.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gfx/webrender_bindings/RendererOGL.cpp b/gfx/webrender_bindings/RendererOGL.cpp
index f31a0afc75ba..59c47ad314e7 100644
--- a/gfx/webrender_bindings/RendererOGL.cpp
+++ b/gfx/webrender_bindings/RendererOGL.cpp
@@ -205,6 +205,9 @@ RenderedFrameId RendererOGL::UpdateAndRender(
          layers::ProfilerScreenshots::IsEnabled())) {
       fullRender = true;
     }
+  } else if (!mCompositor->MakeCurrent()) {
+    // MakeCurrent is otherwise called by mCompositor->BeginFrame above.
+    return RenderedFrameId();
   }
 
   if (!beginFrame) {