If checking GL version fails attempt to create a GL ES context

gfx-rs · Jul 26, 2024 · 195ebfa · 195ebfa
1 parent 901d326
commit 195ebfa
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/wgpu-hal/src/gles/egl.rs b/wgpu-hal/src/gles/egl.rs
@@ -538,29 +538,33 @@ impl Inner {
             {
                 // check if GL version is supported
                 egl.bind_api(khronos_egl::OPENGL_API).unwrap();
-                let ctx = egl
+                match egl
                     .create_context(display, config, None, &[khronos_egl::NONE])
                     .map_err(|e| {
                         crate::InstanceError::with_source(
                             String::from("unable to create GL context"),
                             e,
                         )
-                    })?;
-                let _ = egl.make_current(display, None, None, Some(ctx));
-                let gl = unsafe {
-                    glow::Context::from_loader_function(|name| {
-                        egl.get_proc_address(name)
-                            .map_or(ptr::null(), |p| p as *const _)
-                    })
-                };
-                let gl_version_supported = *gl.version()
-                    >= (glow::Version {
-                        major: 3,
-                        minor: 3,
-                        ..gl.version().clone()
-                    });
-                let _ = egl.destroy_context(display, ctx);
-                gl_version_supported
+                    }) {
+                    Ok(ctx) => {
+                        let _ = egl.make_current(display, None, None, Some(ctx));
+                        let gl = unsafe {
+                            glow::Context::from_loader_function(|name| {
+                                egl.get_proc_address(name)
+                                    .map_or(ptr::null(), |p| p as *const _)
+                            })
+                        };
+                        let gl_version_supported = *gl.version()
+                            >= (glow::Version {
+                                major: 3,
+                                minor: 3,
+                                ..gl.version().clone()
+                            });
+                        let _ = egl.destroy_context(display, ctx);
+                        gl_version_supported
+                    }
+                    Err(_) => false,
+                }
             } else {
                 false
             }