refactor(opengl-bindings): remove CurrentContextWithFns

1 files changed, 14 insertions, 10 deletions

diff --git a/opengl-bindings/src/misc.rs b/opengl-bindings/src/misc.rs
index 8d871b1..047221b 100644
--- a/opengl-bindings/src/misc.rs
+++ b/opengl-bindings/src/misc.rs
@@ -1,7 +1,7 @@
 use bitflags::bitflags;
 
 use crate::data_types::{Dimens, Vec2};
-use crate::CurrentContextWithFns;
+use crate::MaybeCurrentContextWithFns;
 
 /// Sets the viewport.
 ///
@@ -10,7 +10,7 @@ use crate::CurrentContextWithFns;
 /// # Errors
 /// Returns `Err` if any value in `position` or `size` does not fit into a `i32`.
 pub fn set_viewport(
-    current_context: &CurrentContextWithFns<'_>,
+    current_context: &MaybeCurrentContextWithFns,
     position: &Vec2<u32>,
     size: &Dimens<u32>,
 ) -> Result<(), SetViewportError>
@@ -55,7 +55,7 @@ pub fn set_viewport(
 }
 
 pub fn get_viewport(
-    current_context: &CurrentContextWithFns<'_>,
+    current_context: &MaybeCurrentContextWithFns,
 ) -> (Vec2<u32>, Dimens<u32>)
 {
     let mut values = [0i32; 4];
@@ -81,7 +81,10 @@ pub fn get_viewport(
     (pos, size)
 }
 
-pub fn clear_buffers(current_context: &CurrentContextWithFns<'_>, mask: BufferClearMask)
+pub fn clear_buffers(
+    current_context: &MaybeCurrentContextWithFns,
+    mask: BufferClearMask,
+)
 {
     unsafe {
         current_context.fns().Clear(mask.bits());
@@ -89,7 +92,7 @@ pub fn clear_buffers(current_context: &CurrentContextWithFns<'_>, mask: BufferCl
 }
 
 pub fn set_polygon_mode(
-    current_context: &CurrentContextWithFns<'_>,
+    current_context: &MaybeCurrentContextWithFns,
     face: impl Into<PolygonModeFace>,
     mode: impl Into<PolygonMode>,
 )
@@ -101,14 +104,14 @@ pub fn set_polygon_mode(
     }
 }
 
-pub fn enable(current_context: &CurrentContextWithFns<'_>, capacity: Capability)
+pub fn enable(current_context: &MaybeCurrentContextWithFns, capacity: Capability)
 {
     unsafe {
         current_context.fns().Enable(capacity as u32);
     }
 }
 
-pub fn disable(current_context: &CurrentContextWithFns<'_>, capability: Capability)
+pub fn disable(current_context: &MaybeCurrentContextWithFns, capability: Capability)
 {
     unsafe {
         current_context.fns().Disable(capability as u32);
@@ -116,7 +119,7 @@ pub fn disable(current_context: &CurrentContextWithFns<'_>, capability: Capabili
 }
 
 pub fn set_enabled(
-    current_context: &CurrentContextWithFns<'_>,
+    current_context: &MaybeCurrentContextWithFns,
     capability: Capability,
     enabled: bool,
 )
@@ -129,7 +132,8 @@ pub fn set_enabled(
 }
 
 #[must_use]
-pub fn get_context_flags(current_context: &CurrentContextWithFns<'_>) -> ContextFlags
+pub fn get_context_flags(current_context: &MaybeCurrentContextWithFns)
+    -> ContextFlags
 {
     let mut context_flags = crate::sys::types::GLint::default();
 
@@ -144,7 +148,7 @@ pub fn get_context_flags(current_context: &CurrentContextWithFns<'_>) -> Context
 
 /// Defines a rectangle, called the scissor box, in window coordinates.
 pub fn define_scissor_box(
-    current_context: &CurrentContextWithFns<'_>,
+    current_context: &MaybeCurrentContextWithFns,
     lower_left_corner_pos: Vec2<u16>,
     size: Dimens<u16>,
 )