From c895d58979e8dc93690dc05b8a3faebe39be66ab Mon Sep 17 00:00:00 2001
From: sagudev <16504129+sagudev@users.noreply.github.com>
Date: Tue, 14 Jan 2025 19:22:21 +0100
Subject: [PATCH] some fixes

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
---
 webxr/gl_utils.rs     | 7 ++-----
 webxr/glwindow/mod.rs | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/webxr/gl_utils.rs b/webxr/gl_utils.rs
index 5bc2a7b..b6f8da9 100644
--- a/webxr/gl_utils.rs
+++ b/webxr/gl_utils.rs
@@ -7,7 +7,6 @@ use glow as gl;
 use glow::Context as Gl;
 use glow::HasContext;
 use std::collections::HashMap;
-use std::num::NonZero;
 use surfman::Device as SurfmanDevice;
 use webxr_api::ContextId;
 use webxr_api::GLContexts;
@@ -108,8 +107,6 @@ impl GlClearer {
             let mut clear_color = [0., 0., 0., 0.];
             let mut clear_depth = [0.];
             let mut clear_stencil = [0];
-            let color_mask;
-            let depth_mask;
             let mut stencil_mask = [0];
             let scissor_enabled = gl.is_enabled(gl::SCISSOR_TEST);
             let rasterizer_enabled = gl.is_enabled(gl::RASTERIZER_DISCARD);
@@ -119,9 +116,9 @@ impl GlClearer {
             gl.get_parameter_f32_slice(gl::COLOR_CLEAR_VALUE, &mut clear_color[..]);
             gl.get_parameter_f32_slice(gl::DEPTH_CLEAR_VALUE, &mut clear_depth[..]);
             gl.get_parameter_i32_slice(gl::STENCIL_CLEAR_VALUE, &mut clear_stencil[..]);
-            depth_mask = gl.get_parameter_bool(gl::DEPTH_WRITEMASK);
+            let depth_mask = gl.get_parameter_bool(gl::DEPTH_WRITEMASK);
             gl.get_parameter_i32_slice(gl::STENCIL_WRITEMASK, &mut stencil_mask[..]);
-            color_mask = gl.get_parameter_bool_array::<4>(gl::COLOR_WRITEMASK);
+            let color_mask = gl.get_parameter_bool_array::<4>(gl::COLOR_WRITEMASK);
 
             // Clear it
             gl.bind_framebuffer(gl::FRAMEBUFFER, fbo);
diff --git a/webxr/glwindow/mod.rs b/webxr/glwindow/mod.rs
index 262454a..e708e4b 100644
--- a/webxr/glwindow/mod.rs
+++ b/webxr/glwindow/mod.rs
@@ -217,8 +217,7 @@ impl DeviceAPI for GlWindowDevice {
             .device
             .context_surface_info(&self.context)
             .unwrap()
-            .map(|info| info.framebuffer_object)
-            .flatten();
+            .and_then(|info| info.framebuffer_object);
         unsafe {
             self.gl
                 .bind_framebuffer(gl::FRAMEBUFFER, framebuffer_object);
@@ -386,8 +385,7 @@ impl GlWindowDevice {
             let framebuffer_object = device
                 .context_surface_info(&context)
                 .unwrap()
-                .map(|info| info.framebuffer_object)
-                .flatten();
+                .and_then(|info| info.framebuffer_object);
             gl.bind_framebuffer(gl::FRAMEBUFFER, framebuffer_object);
             debug_assert_eq!(
                 (gl.get_error(), gl.check_framebuffer_status(gl::FRAMEBUFFER)),