flush

servo · Feb 10, 2025 · 19c9ac6 · 19c9ac6
1 parent 332bb18
commit 19c9ac6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/platform/generic/egl/context.rs b/src/platform/generic/egl/context.rs
@@ -13,6 +13,7 @@ use crate::egl::types::{EGLConfig, EGLContext, EGLDisplay, EGLSurface, EGLint};
 use crate::surface::Framebuffer;
 use crate::{ContextAttributeFlags, ContextAttributes, ContextID, Error, GLApi, GLVersion};
 use crate::{Gl, SurfaceInfo};
+use glow::HasContext;
 
 use std::ffi::CString;
 use std::mem;
@@ -214,6 +215,9 @@ impl EGLBackedContext {
         gl: &Gl,
         egl_display: EGLDisplay,
     ) -> Result<Option<EGLBackedSurface>, Error> {
+        // Flush to avoid races on Mesa/Intel and possibly other GPUs.
+        gl.flush();
+
         match self.framebuffer {
             Framebuffer::None => return Ok(None),
             Framebuffer::Surface(_) => {}

diff --git a/src/platform/generic/egl/surface.rs b/src/platform/generic/egl/surface.rs
@@ -328,9 +328,6 @@ impl EGLBackedSurface {
                     return;
                 }
 
-                // Flush to avoid races on Mesa/Intel and possibly other GPUs.
-                gl.flush();
-
                 egl.MakeCurrent(egl_display, egl::NO_SURFACE, egl::NO_SURFACE, egl_context);
 
                 match self.objects {