Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add const VIRTGPU_XRES, VIRTGPU_YRES in boards/qemu.rs for X*Y resolution in virtio_gpu

Browse source
This commit is contained in:
Yu Chen 2022-06-22 23:55:15 +08:00
parent 35c4055dd0
commit eddb2d345d
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
os/src/gui/graphic.rs
View file

@ -5,7 +5,8 @@ use embedded_graphics::{
prelude::{OriginDimensions, Point, RgbColor, Size},
};
use crate::drivers::{GPUDevice, GPU_DEVICE};
use crate::drivers::{GPUDevice, GPU_DEVICE,};
use crate::board::{VIRTGPU_XRES, VIRTGPU_YRES};
#[derive(Clone)]
pub struct Graphics {
@ -42,7 +43,7 @@ impl DrawTarget for Graphics {
let fb = self.drv.getfreambuffer();
pixels.into_iter().for_each(|px| {
let idx = ((self.point.y + px.0.y) * 1280 + self.point.x + px.0.x) as usize * 4;
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;
}

4
os/src/gui/icon.rs
View file

@ -10,7 +10,7 @@ use embedded_graphics::{
use tinybmp::Bmp;
use crate::{drivers::GPU_DEVICE, sync::UPIntrFreeCell};
use crate::board::{VIRTGPU_XRES, VIRTGPU_YRES};
use super::{Component, Graphics, ImageComp};
static FILEICON: &[u8] = include_bytes!("../assert/file.bmp");
@ -32,7 +32,7 @@ impl IconController {
UPIntrFreeCell::new(IconControllerInner {
files,
graphic: Graphics {
size: Size::new(1280, 800),
size: Size::new(VIRTGPU_XRES, VIRTGPU_YRES),
point: Point::new(0, 0),
drv: GPU_DEVICE.clone(),
},