c/helos1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

main: refactor to keep the EFI headers from polluting the main namespace

Browse Source
This commit is contained in:
Edgaru089
2021-11-06 23:40:50 +08:00
parent e2a2679f6d
commit 4460661bfd
13 changed files with 89 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
graphics/graphics.c
View File

@ -9,6 +9,7 @@
#include "../runtime/stdio.h"
#include "../util/minmax.h"
#include "../util/stack.h"
#include "../efimain.h"
#include <efiprot.h>
#include <assert.h>

11
graphics/graphics.h
View File

@ -1,7 +1,6 @@
#pragma once
#include "../main.h"
#include "efiprot.h"
#include "color.h"
#include "xcursor/xcursor.h"
@ -14,12 +13,16 @@ extern "C" {
#define HELOS_GRAPHICS_TARGET_MODE_WIDTH 1600
#define HELOS_GRAPHICS_TARGET_MODE_HEIGHT 900
typedef enum {
graphics_PixelFormat_RGBA_8bit,
graphics_PixelFormat_BGRA_8bit,
} graphics_PixelFormat;
typedef struct {
int Width, Height;
int PixelsPerLine;
EFI_GRAPHICS_PIXEL_FORMAT PixelFormat;
graphics_PixelFormat PixelFormat;
} HelosGraphics_Mode;
@ -48,9 +51,9 @@ void graphics_SetPixel_BGR(int posX, int posY, const HelosGraphics_Color *color)
// graphics_SetPixel calls one of SetPixel_RGB/BGR according to the framebuffer format.
static inline void graphics_SetPixel(int posX, int posY, const HelosGraphics_Color *color) {
if (graphics_SystemVideoMode.PixelFormat == PixelBlueGreenRedReserved8BitPerColor)
if (graphics_SystemVideoMode.PixelFormat == graphics_PixelFormat_BGRA_8bit)
graphics_SetPixel_BGR(posX, posY, color);
else if (graphics_SystemVideoMode.PixelFormat == PixelRedGreenBlueReserved8BitPerColor)
else if (graphics_SystemVideoMode.PixelFormat == graphics_PixelFormat_RGBA_8bit)
graphics_SetPixel_RGB(posX, posY, color);
}