add embedded-graphics crate, but compiling error

Author: chyyuu

user/Cargo.toml

@@ -11,6 +11,7 @@ buddy_system_allocator = "0.6"
 bitflags = "1.2.1"
 riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
 embedded-graphics = "0.7.1"
+# lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
 
 [profile.release]
 debug = true

user/src/bin/embed_graph.rs

@@ -0,0 +1,173 @@
+#![no_std]
+#![no_main]
+
+use user_lib::{framebuffer, framebuffer_flush};
+
+#[macro_use]
+extern crate user_lib;
+
+extern crate alloc;
+
+use alloc::sync::Arc;
+use embedded_graphics::pixelcolor::Rgb888;
+use embedded_graphics::prelude::{Drawable, Point, RgbColor, Size};
+use embedded_graphics::primitives::Primitive;
+use embedded_graphics::primitives::{PrimitiveStyle, Rectangle};
+use embedded_graphics::{draw_target::DrawTarget, prelude::OriginDimensions};
+
+pub const VIRTGPU_XRES: usize = 1280;
+pub const VIRTGPU_YRES: usize = 800;
+pub const VIRTGPU_LEN: usize = VIRTGPU_XRES * VIRTGPU_YRES * 4;
+
+const INIT_X: i32 = 640;
+const INIT_Y: i32 = 400;
+const RECT_SIZE: u32 = 40;
+
+// lazy_static::lazy_static! {
+// pub static ref FB: Arc<Display> = Arc::new(Display::new(Size::new(VIRTGPU_XRES as u32, VIRTGPU_YRES as u32), Point::new(INIT_X, INIT_Y)));
+//  }
+
+#[derive(Clone)]
+pub struct Display {
+    pub size: Size,
+    pub point: Point,
+    pub fb: Arc<&'static mut [u8]>,
+}
+
+impl Display {
+    pub fn new(size: Size, point: Point) -> Self {
+        let fb_ptr = framebuffer() as *mut u8;
+        println!(
+            "Hello world from user mode program! 0x{:X} , len {}",
+            fb_ptr as usize, VIRTGPU_LEN
+        );
+        let fb =
+            unsafe { Arc::new(core::slice::from_raw_parts_mut(fb_ptr as *mut u8, VIRTGPU_LEN as usize)) };
+
+        Self { size, point, fb }
+    }
+    // pub fn reset(&self) {
+    //     let fb = self.drv.get_framebuffer();
+    //     fb.fill(0u8);
+    // }
+}
+
+impl OriginDimensions for Display {
+    fn size(&self) -> Size {
+        self.size
+    }
+}
+
+impl DrawTarget for Display {
+    type Color = Rgb888;
+
+    type Error = core::convert::Infallible;
+
+    fn draw_iter<I>(&mut self, pixels: I) -> Result<(), Self::Error>
+    where
+        I: IntoIterator<Item = embedded_graphics::Pixel<Self::Color>>,
+    {
+        let fb = self.fb.clone();
+        //let mut arc_data_mut = Arc::make_mut(fb);
+        pixels.into_iter().for_each(|px| {
+            let idx = ((self.point.y + px.0.y) * VIRTGPU_XRES as i32 + self.point.x + px.0.x)
+                as usize
+                * 4;
+            if idx + 2 >= fb.len() {
+                return;
+            }
+            fb[idx] = px.1.b();
+            fb[idx + 1] = px.1.g();
+            fb[idx + 2] = px.1.r();
+        });
+        framebuffer_flush();
+        Ok(())
+    }
+}
+
+pub struct DrawingBoard {
+    disp: Display,
+    latest_pos: Point,
+}
+
+impl DrawingBoard {
+    pub fn new() -> Self {
+        Self {
+            disp: Display::new(Size::new(1280, 800), Point::new(0, 0)),
+            latest_pos: Point::new(INIT_X, INIT_Y),
+        }
+    }
+    fn paint(&mut self) {
+        Rectangle::with_center(self.latest_pos, Size::new(RECT_SIZE, RECT_SIZE))
+            .into_styled(PrimitiveStyle::with_stroke(Rgb888::WHITE, 1))
+            .draw(&mut self.disp)
+            .ok();
+    }
+    fn unpaint(&mut self) {
+        Rectangle::with_center(self.latest_pos, Size::new(RECT_SIZE, RECT_SIZE))
+            .into_styled(PrimitiveStyle::with_stroke(Rgb888::BLACK, 1))
+            .draw(&mut self.disp)
+            .ok();
+    }
+    pub fn move_rect(&mut self, dx: i32, dy: i32) {
+        self.unpaint();
+        self.latest_pos.x += dx;
+        self.latest_pos.y += dy;
+        self.paint();
+    }
+
+    // pub fn reset(&mut self) {
+    //     self.latest_pos = Point::new(INIT_X, INIT_Y);
+    //     self.disp.reset();
+    // }
+}
+
+// lazy_static! {
+//     pub static ref DRAWING_BOARD: UPIntrFreeCell<DrawingBoard> =
+//         unsafe { UPIntrFreeCell::new(DrawingBoard::new()) };
+// }
+
+// pub fn init_paint() {
+//     DRAWING_BOARD.exclusive_session(|ripple| {
+//         ripple.paint();
+//     });
+// }
+
+// pub fn move_rect(dx: i32, dy: i32) {
+//     DRAWING_BOARD.exclusive_session(|ripple| {
+//         ripple.move_rect(dx, dy);
+//     });
+// }
+
+// pub fn reset() {
+//     DRAWING_BOARD.exclusive_session(|ripple| {
+//         ripple.reset();
+//     });
+// }
+
+#[no_mangle]
+pub fn main() -> i32 {
+    // let fb_ptr = framebuffer() as *mut u8;
+    let mut board=DrawingBoard::new();
+    board.paint();
+    for i in 0..100 {
+        board.latest_pos.x += i;
+        board.latest_pos.y += i;
+    board.paint();
+    }
+    // println!(
+    //     "Hello world from user mode program! 0x{:X} , len {}",
+    //     fb_ptr as usize, VIRTGPU_LEN
+    // );
+    // let fb = unsafe { core::slice::from_raw_parts_mut(fb_ptr as *mut u8, VIRTGPU_LEN as usize) };
+    // for y in 0..800 {
+    //     for x in 0..1280 {
+    //         let idx = (y * 1280 + x) * 4;
+    //         fb[idx] = x as u8;
+    //         fb[idx + 1] = y as u8;
+    //         fb[idx + 2] = (x + y) as u8;
+    //     }
+    // }
+    // framebuffer_flush();
+    0
+}