diff options
Diffstat (limited to 'opengl-bindings/src/vertex_array.rs')
| -rw-r--r-- | opengl-bindings/src/vertex_array.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/opengl-bindings/src/vertex_array.rs b/opengl-bindings/src/vertex_array.rs index 30afde4..74ef899 100644 --- a/opengl-bindings/src/vertex_array.rs +++ b/opengl-bindings/src/vertex_array.rs @@ -3,7 +3,7 @@ use std::ffi::c_void; use safer_ffi::layout::ReprC; use crate::buffer::Buffer; -use crate::CurrentContextWithFns; +use crate::MaybeCurrentContextWithFns; #[derive(Debug)] pub struct VertexArray @@ -14,7 +14,7 @@ pub struct VertexArray impl VertexArray { #[must_use] - pub fn new(current_context: &CurrentContextWithFns<'_>) -> Self + pub fn new(current_context: &MaybeCurrentContextWithFns) -> Self { let mut array = 0; @@ -32,7 +32,7 @@ impl VertexArray /// - `vertex_offset` is too large /// - `vertex_cnt` is too large pub fn draw_arrays( - current_context: &CurrentContextWithFns<'_>, + current_context: &MaybeCurrentContextWithFns, primitive_kind: PrimitiveKind, vertex_offset: u32, vertex_cnt: u32, @@ -70,7 +70,7 @@ impl VertexArray /// # Errors /// Returns `Err` if `cnt` is too large. pub fn draw_elements( - current_context: &CurrentContextWithFns<'_>, + current_context: &MaybeCurrentContextWithFns, DrawElementsOptions { primitive_kind, element_offset, @@ -115,7 +115,7 @@ impl VertexArray pub fn bind_element_buffer( &self, - current_context: &CurrentContextWithFns<'_>, + current_context: &MaybeCurrentContextWithFns, element_buffer: &Buffer<u32>, ) { @@ -128,7 +128,7 @@ impl VertexArray pub fn bind_vertex_buffer<VertexBufferItem: ReprC>( &self, - current_context: &CurrentContextWithFns<'_>, + current_context: &MaybeCurrentContextWithFns, binding_index: u32, vertex_buffer: &Buffer<VertexBufferItem>, vertex_buffer_spec: VertexBufferSpec, @@ -165,7 +165,7 @@ impl VertexArray pub fn enable_attrib( &self, - current_context: &CurrentContextWithFns<'_>, + current_context: &MaybeCurrentContextWithFns, attrib_index: u32, ) { @@ -179,7 +179,7 @@ impl VertexArray pub fn set_attrib_format( &self, - current_context: &CurrentContextWithFns<'_>, + current_context: &MaybeCurrentContextWithFns, attrib_index: u32, attrib_format: AttributeFormat, ) @@ -203,7 +203,7 @@ impl VertexArray /// Associate a vertex attribute and a vertex buffer binding. pub fn set_attrib_vertex_buf_binding( &self, - current_context: &CurrentContextWithFns<'_>, + current_context: &MaybeCurrentContextWithFns, attrib_index: u32, vertex_buf_binding_index: u32, ) @@ -217,12 +217,12 @@ impl VertexArray } } - pub fn bind(&self, current_context: &CurrentContextWithFns<'_>) + pub fn bind(&self, current_context: &MaybeCurrentContextWithFns) { unsafe { current_context.fns().BindVertexArray(self.array) } } - pub fn delete(&self, current_context: &CurrentContextWithFns<'_>) + pub fn delete(&self, current_context: &MaybeCurrentContextWithFns) { unsafe { current_context |