Fix surfaceless validation: check the actual OpenGL version

rust-windowing · Oct 31, 2024 · bc38760 · bc38760
1 parent 5b20586
commit bc38760
Showing 1 changed file with 32 additions and 26 deletions.
diff --git a/glutin/src/api/glx/context.rs b/glutin/src/api/glx/context.rs
@@ -41,13 +41,14 @@ impl Display {
             std::ptr::null()
         };
 
-        let context = if self.inner.client_extensions.contains("GLX_ARB_create_context")
-            && self.inner.glx_extra.is_some()
-        {
-            self.create_context_arb(config, context_attributes, shared_context)?
-        } else {
-            self.create_context_legacy(config, shared_context)?
-        };
+        let (context, supports_surfaceless) =
+            if self.inner.client_extensions.contains("GLX_ARB_create_context")
+                && self.inner.glx_extra.is_some()
+            {
+                self.create_context_arb(config, context_attributes, shared_context)?
+            } else {
+                (self.create_context_legacy(config, shared_context)?, false)
+            };
 
         // Failed to create the context.
         if context.is_null() {
@@ -56,8 +57,13 @@ impl Display {
 
         let config = config.clone();
         let is_gles = matches!(context_attributes.api, Some(ContextApi::Gles(_)));
-        let inner =
-            ContextInner { display: self.clone(), config, raw: GlxContext(context), is_gles };
+        let inner = ContextInner {
+            display: self.clone(),
+            config,
+            raw: GlxContext(context),
+            is_gles,
+            supports_surfaceless,
+        };
 
         Ok(NotCurrentContext::new(inner))
     }
@@ -67,14 +73,14 @@ impl Display {
         config: &Config,
         context_attributes: &ContextAttributes,
         shared_context: GLXContext,
-    ) -> Result<GLXContext> {
+    ) -> Result<(GLXContext, bool)> {
         let extra = self.inner.glx_extra.as_ref().unwrap();
         let mut attrs = Vec::<c_int>::with_capacity(16);
 
         // Check whether the ES context creation is supported.
         let supports_es = self.inner.features.contains(DisplayFeatures::CREATE_ES_CONTEXT);
 
-        let (profile, version) = match context_attributes.api {
+        let (profile, version, supports_surfaceless) = match context_attributes.api {
             api @ Some(ContextApi::OpenGl(_)) | api @ None => {
                 let version = api.and_then(|api| api.version());
                 let (profile, version) = context::pick_profile(context_attributes.profile, version);
@@ -83,11 +89,16 @@ impl Display {
                     GlProfile::Compatibility => glx_extra::CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
                 };
 
-                (Some(profile), Some(version))
+                // Surfaceless contexts are supported with the GLX_ARB_create_context extension
+                // when using OpenGL 3.0 or greater.
+                let supports_surfaceless = version >= Version::new(3, 0);
+
+                (Some(profile), Some(version), supports_surfaceless)
             },
             Some(ContextApi::Gles(version)) if supports_es => (
                 Some(glx_extra::CONTEXT_ES2_PROFILE_BIT_EXT),
                 Some(version.unwrap_or(Version::new(2, 0))),
+                false,
             ),
             _ => {
                 return Err(ErrorKind::NotSupported(
@@ -188,7 +199,7 @@ impl Display {
         // Terminate list with zero.
         attrs.push(0);
 
-        super::last_glx_error(|| unsafe {
+        let context = super::last_glx_error(|| unsafe {
             extra.CreateContextAttribsARB(
                 self.inner.raw.cast(),
                 *config.inner.raw,
@@ -197,7 +208,9 @@ impl Display {
                 1,
                 attrs.as_ptr(),
             )
-        })
+        })?;
+
+        Ok((context, supports_surfaceless))
     }
 
     fn create_context_legacy(
@@ -380,22 +393,15 @@ struct ContextInner {
     config: Config,
     raw: GlxContext,
     is_gles: bool,
+    supports_surfaceless: bool,
 }
 
 impl ContextInner {
     fn make_current_surfaceless(&self) -> Result<()> {
-        // Surfaceless contexts are supported with the GLX_ARB_create_context extension
-        // when using OpenGL 3.0 or greater.
-        // Source: https://registry.khronos.org/OpenGL/extensions/ARB/GLX_ARB_create_context.txt
-        {
-            let extension_enabled =
-                self.display.inner.client_extensions.contains("GLX_ARB_create_context");
-            let version_supported = self.display.inner.version >= Version::new(3, 0);
-            if !extension_enabled || !version_supported {
-                return Err(
-                    ErrorKind::NotSupported("the surfaceless context Api isn't supported").into()
-                );
-            }
+        if !self.supports_surfaceless {
+            return Err(
+                ErrorKind::NotSupported("the surfaceless context Api isn't supported").into()
+            );
         }
 
         // Passing zero arguments for both `draw` and `read` parameters makes