Pass gl to ContextDescriptor::from_egl_context

servo · Feb 9, 2025 · a65b884 · a65b884
1 parent f36b577
commit a65b884
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 20 deletions.
diff --git a/src/platform/egl/context.rs b/src/platform/egl/context.rs
@@ -202,11 +202,7 @@ impl Device {
     /// Returns the descriptor that this context was created with.
     pub fn context_descriptor(&self, context: &Context) -> ContextDescriptor {
         unsafe {
-            ContextDescriptor::from_egl_context(
-                context::get_proc_address,
-                self.egl_display,
-                context.egl_context,
-            )
+            ContextDescriptor::from_egl_context(&context.gl, self.egl_display, context.egl_context)
         }
     }
 

diff --git a/src/platform/generic/egl/context.rs b/src/platform/generic/egl/context.rs
@@ -382,20 +382,16 @@ impl ContextDescriptor {
         })
     }
 
-    pub(crate) unsafe fn from_egl_context<F>(
-        get_proc_address: F,
+    pub(crate) unsafe fn from_egl_context(
+        gl: &Gl,
         egl_display: EGLDisplay,
         egl_context: EGLContext,
-    ) -> ContextDescriptor
-    where
-        F: FnMut(&str) -> *const c_void,
-    {
+    ) -> ContextDescriptor {
         let egl_config_id = get_context_attr(egl_display, egl_context, egl::CONFIG_ID as EGLint);
 
         EGL_FUNCTIONS.with(|egl| {
             let _guard = CurrentContextGuard::new();
             egl.MakeCurrent(egl_display, egl::NO_SURFACE, egl::NO_SURFACE, egl_context);
-            let gl = unsafe { Gl::from_loader_function(get_proc_address) };
             let gl_version = GLVersion::current(&gl);
             let compatibility_profile = context::current_context_uses_compatibility_profile(&gl);
 

diff --git a/src/platform/unix/generic/context.rs b/src/platform/unix/generic/context.rs
@@ -128,7 +128,7 @@ impl Device {
     pub fn context_descriptor(&self, context: &Context) -> ContextDescriptor {
         unsafe {
             ContextDescriptor::from_egl_context(
-                context::get_proc_address,
+                &context.1,
                 self.native_connection.egl_display,
                 context.0.egl_context,
             )

diff --git a/src/platform/unix/wayland/context.rs b/src/platform/unix/wayland/context.rs
@@ -126,7 +126,7 @@ impl Device {
     pub fn context_descriptor(&self, context: &Context) -> ContextDescriptor {
         unsafe {
             ContextDescriptor::from_egl_context(
-                context::get_proc_address,
+                &context.1,
                 self.native_connection.egl_display,
                 context.0.egl_context,
             )

diff --git a/src/platform/unix/x11/context.rs b/src/platform/unix/x11/context.rs
@@ -125,7 +125,7 @@ impl Device {
     pub fn context_descriptor(&self, context: &Context) -> ContextDescriptor {
         unsafe {
             ContextDescriptor::from_egl_context(
-                context::get_proc_address,
+                &context.1,
                 self.native_connection.egl_display,
                 context.0.egl_context,
             )

diff --git a/src/platform/windows/angle/context.rs b/src/platform/windows/angle/context.rs
@@ -187,11 +187,7 @@ impl Device {
     /// Returns the descriptor that this context was created with.
     pub fn context_descriptor(&self, context: &Context) -> ContextDescriptor {
         unsafe {
-            ContextDescriptor::from_egl_context(
-                context::get_proc_address,
-                self.egl_display,
-                context.egl_context,
-            )
+            ContextDescriptor::from_egl_context(&context.gl, self.egl_display, context.egl_context)
         }
     }