xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Fix framebuffer address calculations by using Pitch and BytesPerPixel
All checks were successful
Builds / ExectOS (i686, debug) (push) Successful in 33s
Details
Builds / ExectOS (i686, release) (push) Successful in 32s
Details
Builds / ExectOS (amd64, debug) (push) Successful in 35s
Details
Builds / ExectOS (amd64, release) (push) Successful in 33s
Details

Browse Source
This commit is contained in:
Aiken Harris 2025-09-02 12:42:06 +02:00
parent 6ee7243e04
commit e23a4c71a2
Signed by: harraiken
GPG Key ID: C40F06CB7493C1F5
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/xtdk/hltypes.h
View File

@ -376,6 +376,7 @@ typedef struct _HAL_FRAMEBUFFER_DATA
UINT Height; UINT Height;
UINT PixelsPerScanLine; UINT PixelsPerScanLine;
UINT BitsPerPixel; UINT BitsPerPixel;
UINT BytesPerPixel;
UINT Pitch; UINT Pitch;
PVOID Font; PVOID Font;
struct struct

36
xtoskrnl/hl/fbdev.c
View File

@ -24,9 +24,10 @@ XTAPI
VOID VOID
HlClearScreen(IN ULONG Color) HlClearScreen(IN ULONG Color)
{ {
SIZE_T Line, PositionX, PositionY; ULONG PositionX, PositionY;
ULONG BackgroundColor; ULONG BackgroundColor;
PULONG FrameBuf; PCHAR CurrentLine;
PULONG Pixel;
/* Make sure frame buffer is already initialized */ /* Make sure frame buffer is already initialized */
if(HlpFrameBufferData.Initialized == FALSE) if(HlpFrameBufferData.Initialized == FALSE)
@ -35,19 +36,19 @@ HlClearScreen(IN ULONG Color)
return; return;
} }
/* Get pointer to frame buffer */ /* Convert background color and get pointer to frame buffer */
FrameBuf = HlpFrameBufferData.Address;
/* Convert background color */
BackgroundColor = HlpRGBColor(Color); BackgroundColor = HlpRGBColor(Color);
CurrentLine = HlpFrameBufferData.Address;
/* Fill the screen with a black box */ /* Fill the screen with the specified color */
for(PositionY = 0; PositionY < HlpFrameBufferData.Height; PositionY++) for(PositionY = 0; PositionY < HlpFrameBufferData.Height; PositionY++, CurrentLine += HlpFrameBufferData.Pitch)
{ {
Line = PositionY * HlpFrameBufferData.PixelsPerScanLine; /* Fill the current line with the specified color */
Pixel = (PULONG)CurrentLine;
for(PositionX = 0; PositionX < HlpFrameBufferData.Width; PositionX++) for(PositionX = 0; PositionX < HlpFrameBufferData.Width; PositionX++)
{ {
FrameBuf[Line + PositionX] = BackgroundColor; /* Set the color of the pixel */
Pixel[PositionX] = BackgroundColor;
} }
} }
} }
@ -74,7 +75,7 @@ HlDrawPixel(IN ULONG PositionX,
IN ULONG PositionY, IN ULONG PositionY,
IN ULONG Color) IN ULONG Color)
{ {
SIZE_T FrameBufferIndex; PCHAR PixelAddress;
/* Make sure frame buffer is already initialized */ /* Make sure frame buffer is already initialized */
if(HlpFrameBufferData.Initialized == FALSE) if(HlpFrameBufferData.Initialized == FALSE)
@ -90,11 +91,12 @@ HlDrawPixel(IN ULONG PositionX,
return; return;
} }
/* Calculate the index of the pixel in the frame buffer memory using the provided x and y coordinates */ /* Calculate the address of the pixel in the frame buffer memory */
FrameBufferIndex = 4 * HlpFrameBufferData.PixelsPerScanLine * PositionY + 4 * PositionX; PixelAddress = (PCHAR)HlpFrameBufferData.Address + (PositionY * HlpFrameBufferData.Pitch) +
(PositionX * HlpFrameBufferData.BytesPerPixel);
/* Set the color of the pixel by writing to the corresponding memory location */ /* Set the color of the pixel by writing to the corresponding memory location */
*((PULONG)(HlpFrameBufferData.Address + FrameBufferIndex)) = HlpRGBColor(Color); *((PULONG)PixelAddress) = HlpRGBColor(Color);
} }
/** /**
@ -154,6 +156,7 @@ HlInitializeFrameBuffer(VOID)
HlpFrameBufferData.Width = FrameBufferResource->Width; HlpFrameBufferData.Width = FrameBufferResource->Width;
HlpFrameBufferData.Height = FrameBufferResource->Height; HlpFrameBufferData.Height = FrameBufferResource->Height;
HlpFrameBufferData.BitsPerPixel = FrameBufferResource->BitsPerPixel; HlpFrameBufferData.BitsPerPixel = FrameBufferResource->BitsPerPixel;
HlpFrameBufferData.BytesPerPixel = FrameBufferResource->BitsPerPixel / 8;
HlpFrameBufferData.PixelsPerScanLine = FrameBufferResource->PixelsPerScanLine; HlpFrameBufferData.PixelsPerScanLine = FrameBufferResource->PixelsPerScanLine;
HlpFrameBufferData.Pitch = FrameBufferResource->Pitch; HlpFrameBufferData.Pitch = FrameBufferResource->Pitch;
HlpFrameBufferData.Pixels.BlueShift = FrameBufferResource->Pixels.BlueShift; HlpFrameBufferData.Pixels.BlueShift = FrameBufferResource->Pixels.BlueShift;
@ -261,7 +264,8 @@ HlPutCharacter(IN ULONG PositionX,
} }
/* Find the glyph position on the frame buffer and set font color */ /* Find the glyph position on the frame buffer and set font color */
GlyphPixel = (UINT_PTR)HlpFrameBufferData.Address + PositionY * HlpFrameBufferData.Pitch + PositionX * 4; GlyphPixel = (UINT_PTR)HlpFrameBufferData.Address + PositionY * HlpFrameBufferData.Pitch +
PositionX * HlpFrameBufferData.BytesPerPixel;
FontColor = HlpRGBColor(Color); FontColor = HlpRGBColor(Color);
/* Check all kerning fragments */ /* Check all kerning fragments */
@ -321,7 +325,7 @@ HlPutCharacter(IN ULONG PositionX,
} }
/* Advance pixel pointer */ /* Advance pixel pointer */
Pixel += 4; Pixel += HlpFrameBufferData.BytesPerPixel;
CurrentFragment <<= 1; CurrentFragment <<= 1;
} }