autocommit 2022-04-07 17:31:31 CEST

src/render/renderer/context.rs

@@ -1,21 +1,28 @@
-use crate::drm::dma::DmaBuf;
-use crate::drm::drm::{Drm, NodeType};
-use crate::format::{Format, XRGB8888};
-use crate::render::egl::context::EglContext;
-use crate::render::egl::display::EglDisplay;
-use crate::render::gl::program::GlProgram;
-use crate::render::gl::render_buffer::GlRenderBuffer;
-use crate::render::gl::sys::GLint;
-use crate::render::gl::texture::GlTexture;
-use crate::render::renderer::framebuffer::Framebuffer;
-use crate::render::renderer::image::Image;
-use crate::render::{RenderError, Texture};
-use ahash::AHashMap;
-use std::cell::Cell;
-use std::ffi::CString;
-use std::fmt::{Debug, Formatter};
-use std::rc::Rc;
-use uapi::ustr;
+use {
+    crate::{
+        video::{
+            dma::DmaBuf,
+            drm::{Drm, NodeType},
+        },
+        format::{Format, XRGB8888},
+        render::{
+            egl::{context::EglContext, display::EglDisplay},
+            gl::{
+                program::GlProgram, render_buffer::GlRenderBuffer, sys::GLint, texture::GlTexture,
+            },
+            renderer::{framebuffer::Framebuffer, image::Image},
+            RenderError, Texture,
+        },
+    },
+    ahash::AHashMap,
+    std::{
+        cell::Cell,
+        ffi::CString,
+        fmt::{Debug, Formatter},
+        rc::Rc,
+    },
+    uapi::ustr,
+};
 
 pub(super) struct TexProg {
     pub(super) prog: GlProgram,

src/render/renderer/framebuffer.rs

@@ -1,15 +1,25 @@
-use crate::rect::Rect;
-use crate::render::gl::frame_buffer::GlFrameBuffer;
-use crate::render::gl::sys::{
-    glBindFramebuffer, glClear, glClearColor, glViewport, GL_COLOR_BUFFER_BIT, GL_FRAMEBUFFER,
+use {
+    crate::{
+        rect::Rect,
+        render::{
+            gl::{
+                frame_buffer::GlFrameBuffer,
+                sys::{
+                    glBindFramebuffer, glClear, glClearColor, glViewport, GL_COLOR_BUFFER_BIT,
+                    GL_FRAMEBUFFER,
+                },
+            },
+            renderer::{context::RenderContext, renderer::Renderer},
+            sys::{glBlendFunc, glFlush, GL_ONE, GL_ONE_MINUS_SRC_ALPHA},
+        },
+        state::State,
+        tree::Node,
+    },
+    std::{
+        fmt::{Debug, Formatter},
+        rc::Rc,
+    },
 };
-use crate::render::renderer::context::RenderContext;
-use crate::render::renderer::renderer::Renderer;
-use crate::render::sys::{glBlendFunc, glFlush, GL_ONE, GL_ONE_MINUS_SRC_ALPHA};
-use crate::state::State;
-use crate::tree::Node;
-use std::fmt::{Debug, Formatter};
-use std::rc::Rc;
 
 pub struct Framebuffer {
     pub(super) ctx: Rc<RenderContext>,

src/render/renderer/image.rs

@@ -1,7 +1,9 @@
-use crate::render::egl::image::EglImage;
-use crate::render::gl::texture::GlTexture;
-use crate::render::{RenderContext, RenderError, Texture};
-use std::rc::Rc;
+use {
+    crate::render::{
+        egl::image::EglImage, gl::texture::GlTexture, RenderContext, RenderError, Texture,
+    },
+    std::rc::Rc,
+};
 
 pub struct Image {
     pub(super) ctx: Rc<RenderContext>,

src/render/renderer/renderer.rs

@@ -1,25 +1,35 @@
-use crate::format::{Format, ARGB8888};
-use crate::ifs::wl_buffer::WlBuffer;
-use crate::ifs::wl_surface::xdg_surface::XdgSurface;
-use crate::ifs::wl_surface::zwlr_layer_surface_v1::ZwlrLayerSurfaceV1;
-use crate::ifs::wl_surface::WlSurface;
-use crate::rect::Rect;
-use crate::render::gl::frame_buffer::{with_scissor, GlFrameBuffer};
-use crate::render::gl::sys::{
-    glActiveTexture, glBindTexture, glDisableVertexAttribArray, glDrawArrays,
-    glEnableVertexAttribArray, glTexParameteri, glUniform1i, glUniform4f, glUseProgram,
-    glVertexAttribPointer, GL_FALSE, GL_FLOAT, GL_LINEAR, GL_TEXTURE0, GL_TEXTURE_2D,
-    GL_TEXTURE_MIN_FILTER, GL_TRIANGLES, GL_TRIANGLE_STRIP,
+use {
+    crate::{
+        format::{Format, ARGB8888},
+        ifs::{
+            wl_buffer::WlBuffer,
+            wl_surface::{
+                xdg_surface::XdgSurface, zwlr_layer_surface_v1::ZwlrLayerSurfaceV1, WlSurface,
+            },
+        },
+        rect::Rect,
+        render::{
+            gl::{
+                frame_buffer::{with_scissor, GlFrameBuffer},
+                sys::{
+                    glActiveTexture, glBindTexture, glDisableVertexAttribArray, glDrawArrays,
+                    glEnableVertexAttribArray, glTexParameteri, glUniform1i, glUniform4f,
+                    glUseProgram, glVertexAttribPointer, GL_FALSE, GL_FLOAT, GL_LINEAR,
+                    GL_TEXTURE0, GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_TRIANGLES,
+                    GL_TRIANGLE_STRIP,
+                },
+            },
+            renderer::context::RenderContext,
+            sys::{glDisable, glEnable, GL_BLEND},
+            Texture,
+        },
+        state::State,
+        theme::Color,
+        tree::{ContainerNode, FloatNode, Node, OutputNode, WorkspaceNode},
+        utils::rc_eq::rc_eq,
+    },
+    std::{ops::Deref, rc::Rc},
 };
-use crate::render::renderer::context::RenderContext;
-use crate::render::sys::{glDisable, glEnable, GL_BLEND};
-use crate::render::Texture;
-use crate::state::State;
-use crate::theme::Color;
-use crate::tree::{ContainerNode, FloatNode, Node, OutputNode, WorkspaceNode};
-use crate::utils::rc_eq::rc_eq;
-use std::ops::Deref;
-use std::rc::Rc;
 
 pub struct Renderer<'a> {
     pub(super) ctx: &'a Rc<RenderContext>,

src/render/renderer/texture.rs

@@ -1,6 +1,7 @@
-use crate::render::gl::texture::GlTexture;
-use crate::render::renderer::context::RenderContext;
-use std::rc::Rc;
+use {
+    crate::render::{gl::texture::GlTexture, renderer::context::RenderContext},
+    std::rc::Rc,
+};
 
 pub struct Texture {
     pub(super) ctx: Rc<RenderContext>,