able/vga
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Trying to make 640x480x16 faster

Browse source
This commit is contained in:
Ryan Kennedy 2020-03-29 23:23:41 -05:00
parent 1b21920052
commit 45abc17ab8
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/writers/graphics_640x480x16.rs
View file

@ -10,7 +10,6 @@ use font8x8::UnicodeFonts;
const WIDTH: usize = 640; const WIDTH: usize = 640;
const HEIGHT: usize = 480; const HEIGHT: usize = 480;
const SIZE: usize = WIDTH * HEIGHT; const SIZE: usize = WIDTH * HEIGHT;
const WIDTH_IN_BYTES: usize = WIDTH / 8;
/// A basic interface for interacting with vga graphics mode 640x480x16 /// A basic interface for interacting with vga graphics mode 640x480x16
/// ///
@ -76,15 +75,22 @@ impl Device<Color16> for Graphics640x480x16 {
} }
fn present(&self) { fn present(&self) {
{ let frame_buffer = self.get_frame_buffer();
let mut vga = VGA.lock(); let mut vga = VGA.lock();
let emulation_mode = vga.get_emulation_mode(); let emulation_mode = vga.get_emulation_mode();
while vga.general_registers.read_st01(emulation_mode) & 0x3 != 0 {} while vga.general_registers.read_st01(emulation_mode) & 0x3 != 0 {}
} for offset in 0..SIZE {
for x in 0..WIDTH { let color = self.screen_buffer[offset];
for y in 0..HEIGHT { // Set the mask to the pixel being modified
let color = self.screen_buffer[(WIDTH * y) + x]; vga.graphics_controller_registers
self._set_pixel(x, y, color); .set_bit_mask(0x80 >> (offset & 0x7));
// Faster then offset / 8 ?
let offset = offset >> 3;
unsafe {
// Load the memory latch with 8 pixels
frame_buffer.add(offset).read_volatile();
// Write the color to the masked pixel
frame_buffer.add(offset).write_volatile(color);
} }
} }
} }
@ -126,18 +132,4 @@ impl Graphics640x480x16 {
fn get_frame_buffer(&self) -> *mut u8 { fn get_frame_buffer(&self) -> *mut u8 {
u32::from(VGA.lock().get_frame_buffer()) as *mut u8 u32::from(VGA.lock().get_frame_buffer()) as *mut u8
} }
#[inline]
fn _set_pixel(&self, x: usize, y: usize, color: u8) {
let frame_buffer = self.get_frame_buffer();
let offset = x / 8 + y * WIDTH_IN_BYTES;
let pixel_mask = 0x80 >> (x & 0x07);
VGA.lock()
.graphics_controller_registers
.set_bit_mask(pixel_mask);
unsafe {
frame_buffer.add(offset).read_volatile();
frame_buffer.add(offset).write_volatile(color);
}
}
} }