Nigel/BarinkOS
1
0
Fork 0
Code Issues 1 Pull Requests 2 Releases Activity

Graphics: Moved VBE/VESA driver to drivers folder

Browse Source
This commit is contained in:
Nigel Barink 2021-12-02 21:01:33 +01:00
parent 006c902200
commit 405b9468d5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/kernel/vesa.cpp → src/kernel/drivers/vesa/vesa.cpp
View File

@ -15,13 +15,13 @@ void initVBEDevice(multiboot_info_t* mbt){
} }
void putPixel( int x, int y , uint32_t colour){ void putPixel( int x, int y , uint32_t colour){
printf_serial("putPixel x: %d, y: %d\n", x, y); // printf_serial("putPixel x: %d, y: %d\n", x, y);
///fb + mbt->framebuffer_pitch * y + 4 * x ,NOTE: this calculation is very important ///fb + mbt->framebuffer_pitch * y + 4 * x ,NOTE: this calculation is very important
*(uint32_t*) ( VbeModeInfo->framebuffer + VbeModeInfo->pitch * y + 4 * x ) = colour; *(uint32_t*) ( VbeModeInfo->framebuffer + VbeModeInfo->pitch * y + 4 * x ) = colour;
} }
void drawLine(int x1, int y1, int x2, int y2, uint32_t colour ){ void drawLine(int x1, int y1, int x2, int y2, uint32_t colour ){
print_serial("drawline\n"); print_serial("drawline\n");
// Bresenham's line algorithm?? // See Bresenham's line algorithm
int deltaX = x2 - x1; int deltaX = x2 - x1;
int deltaY = y2 - y1; int deltaY = y2 - y1;
int D = 2 * deltaY - deltaX; int D = 2 * deltaY - deltaX;
@ -41,6 +41,14 @@ void drawLine(int x1, int y1, int x2, int y2, uint32_t colour ){
} }
void drawRect ( int x, int y, int width, int height, uint32_t colour ){ void drawRect ( int x, int y, int width, int height, uint32_t colour ){
print_serial("drawRect\n"); print_serial("drawRect\n");
for ( int i = x; i < x + width; i ++)
{
for(int j = y; j < y + height; j++){
putPixel(i,j, colour);
}
}
} }

4
src/kernel/vesa.h → src/kernel/drivers/vesa/vesa.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "bootloader/multiboot.h" #include "../../bootloader/multiboot.h"
#include "serial.h" #include "../../serial.h"
struct vbe_mode_info_structure{ struct vbe_mode_info_structure{
uint16_t attributes; uint16_t attributes;