diff --git a/.gitignore b/.gitignore index 99c4dbc0..e4fc127c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ gc.properties /android-example/**/.settings SDL2 *.code-workspace +.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7b2b22c3..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "rust-analyzer.cargo.features": "all" -} \ No newline at end of file diff --git a/examples/common/mod.rs b/examples/common/mod.rs index 9417cd7a..cef863a7 100644 --- a/examples/common/mod.rs +++ b/examples/common/mod.rs @@ -3,10 +3,9 @@ // OpenGL convenience wrappers used in the examples. use gl; -use gl::types::{GLchar, GLenum, GLint, GLuint}; +use gl::types::{GLenum, GLint, GLuint}; use std::fs::File; use std::io::Read; -use std::os::raw::c_void; use std::ptr; use surfman::GLApi; diff --git a/src/platform/generic/egl/surface.rs b/src/platform/generic/egl/surface.rs index 625c5fb7..e2a3b4b1 100644 --- a/src/platform/generic/egl/surface.rs +++ b/src/platform/generic/egl/surface.rs @@ -95,12 +95,12 @@ impl EGLBackedSurface { // Create our texture. let texture_object = gl.create_texture().unwrap(); // Save the current texture binding - let mut old_texture_object = gl.get_parameter_texture(gl::TEXTURE_BINDING_2D); + let old_texture_object = gl.get_parameter_texture(gl::TEXTURE_BINDING_2D); gl.bind_texture(gl::TEXTURE_2D, Some(texture_object)); // Unbind PIXEL_UNPACK_BUFFER, because if it is bound, // it can cause errors in glTexImage2D. // TODO: should this be inside a check for GL 2.0? - let mut unpack_buffer = gl.get_parameter_buffer(gl::PIXEL_UNPACK_BUFFER_BINDING); + let unpack_buffer = gl.get_parameter_buffer(gl::PIXEL_UNPACK_BUFFER_BINDING); if unpack_buffer.is_some() { gl.bind_buffer(gl::PIXEL_UNPACK_BUFFER, None); } diff --git a/src/platform/unix/wayland/context.rs b/src/platform/unix/wayland/context.rs index 7bff4286..16d2c274 100644 --- a/src/platform/unix/wayland/context.rs +++ b/src/platform/unix/wayland/context.rs @@ -2,8 +2,6 @@ // //! OpenGL rendering contexts on Wayland. -use glow::HasContext; - use super::device::Device; use super::surface::Surface; use crate::context::ContextID; diff --git a/src/platform/unix/x11/context.rs b/src/platform/unix/x11/context.rs index 330f75bb..def50546 100644 --- a/src/platform/unix/x11/context.rs +++ b/src/platform/unix/x11/context.rs @@ -2,8 +2,6 @@ // //! OpenGL rendering contexts on X11 via EGL. -use glow::HasContext; - use super::device::Device; use super::surface::Surface; use crate::context::ContextID; diff --git a/src/surface.rs b/src/surface.rs index 694801bd..29262565 100644 --- a/src/surface.rs +++ b/src/surface.rs @@ -5,7 +5,6 @@ use crate::context::ContextID; use euclid::default::Size2D; -use glow::NativeFramebuffer; use std::fmt::{self, Display, Formatter}; /// Various data about the surface.