tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-24 22:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor framebuffer handling and remove redundant variables. (not tested on baremetal)

Browse source 
- Removed the 'fb_width_from_pitch' variable and replaced its usage with 'sys_framebuffer_pidth' to standardize the handling of framebuffer width-from-pitch across the codebase.
- Updated references to 'fb_width_from_pitch' in display and screen update functions to use 'sys_framebuffer_pidth', ensuring consistent calculations.
- Replaced 'sys_framebuffer_pitch / (sys_framebuffer_bpp / 8)' with 'sys_framebuffer_pidth' to avoid redundant calculations and improve code readability.
- Fixed framebuffer calculations in 'GrCalcScreenUpdates', 'GrUpdateScreen32', and related functions to use the correct framebuffer width-from-pitch value.
- Corrected and simplified screen update logic in 'GrZoomInScreen' and 'GrUpdateScreen'.
This commit is contained in:
GutPuncher 2024-12-02 01:02:34 -05:00
parent 38c41e551a
commit 2ffd423f7b
No known key found for this signature in database
GPG key ID: 38CE0A7B6841D1C7
5 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Kernel/Display.ZC
View file

@ -8,9 +8,7 @@ See also $LK,"GrUpdateScreen",A="MN:GrUpdateScreen"$().
*/
I64 i, row, col, x, y;
U32 *framebuffer;
U64 ch_bitmap, fb_width_from_pitch;
fb_width_from_pitch = sys_framebuffer_pitch / (sys_framebuffer_bpp / 8);
U64 ch_bitmap;
if (!(text.raw_flags & RAWF_SHOW_DOLLAR))
{
@ -62,17 +60,17 @@ See also $LK,"GrUpdateScreen",A="MN:GrUpdateScreen"$().
{//Scroll screen down
MemCopy(text.fb_alias,
text.fb_alias + fb_width_from_pitch * FONT_HEIGHT,
(text.screen_size - fb_width_from_pitch * FONT_HEIGHT) * sizeof(U32));
text.fb_alias + sys_framebuffer_pidth * FONT_HEIGHT,
(text.screen_size - sys_framebuffer_pidth * FONT_HEIGHT) * sizeof(U32));
MemSetU32(text.fb_alias + text.screen_size - fb_width_from_pitch * FONT_HEIGHT, BLACK32, fb_width_from_pitch * FONT_HEIGHT);
MemSetU32(text.fb_alias + text.screen_size - sys_framebuffer_pidth * FONT_HEIGHT, BLACK32, sys_framebuffer_pidth * FONT_HEIGHT);
text.raw_col -= text.cols ;
row = text.rows - 1;
}
x = col * FONT_WIDTH;
y = row * FONT_HEIGHT;
ch_bitmap = text.font[ch & 0xFF];
framebuffer = text.fb_alias + fb_width_from_pitch * y + x;
framebuffer = text.fb_alias + sys_framebuffer_pidth * y + x;
PUSHFD
CLI
@ -83,7 +81,7 @@ See also $LK,"GrUpdateScreen",A="MN:GrUpdateScreen"$().
else
*framebuffer++ = BLACK32;
if (i & (FONT_WIDTH - 1) == FONT_WIDTH - 1)
framebuffer += fb_width_from_pitch - FONT_WIDTH;
framebuffer += sys_framebuffer_pidth - FONT_WIDTH;
ch_bitmap >>= 1;
}
POPFD

3
src/Kernel/KMain.ZC
View file

@ -91,7 +91,8 @@ U0 SysGrInit()
text.cols = sys_framebuffer_width / FONT_WIDTH;
text.rows = sys_framebuffer_height / FONT_HEIGHT;
text.screen_size = sys_framebuffer_pitch / (sys_framebuffer_bpp / 8) * sys_framebuffer_height;
sys_framebuffer_pidth = sys_framebuffer_pitch / (sys_framebuffer_bpp / 8);
text.screen_size = sys_framebuffer_pidth * sys_framebuffer_height;
text.buffer_size = text.screen_size * 4; //buffer for 32-bit, but only 16 colors now.
text.raw_screen = CAlloc(text.buffer_size);
text.fb_alias = sys_framebuffer_addr;

2
src/Kernel/KernelB.HH
View file

@ -249,7 +249,7 @@ public _extern SYS_FRAMEBUFFER_WIDTH U64 sys_framebuffer_width;
public _extern SYS_FRAMEBUFFER_HEIGHT U64 sys_framebuffer_height;
public _extern SYS_FRAMEBUFFER_PITCH U64 sys_framebuffer_pitch;
public _extern SYS_FRAMEBUFFER_BPP U8 sys_framebuffer_bpp;
public U64 sys_framebuffer_pidth;
_extern SYS_FRAMEBUFFER_LIST CVideoInfo sys_framebuffer_list[VBE_MODES_NUM];
#help_index "Processor/SMBIOS"

2
src/System/Gr/GrGlobals.ZC
View file

@ -56,3 +56,5 @@ DefinePrint("TEXT_ROWS", "%d", text.rows);;
HashPublic("TEXT_ROWS", HTT_DEFINE_STR);;
DefinePrint("TEXT_COLS", "%d", text.cols);;
HashPublic("TEXT_COLS", HTT_DEFINE_STR);;
sys_framebuffer_pidth = sys_framebuffer_pitch / (sys_framebuffer_bpp / 8);

33
src/System/Gr/GrScreen.ZC
View file

@ -142,8 +142,8 @@ public U0 GrScaleZoom(F64 scale)
mouse.offset.x = mouse.pos.x - (mouse.pos.x - mouse.offset.x) * s;
mouse.offset.y = mouse.pos.y - (mouse.pos.y - mouse.offset.y) * s;
mouse.offset.z = mouse.pos.z - (mouse.pos.z - mouse.offset.z) * s;
gr.sx = mouse.pos.x - gr.zoomed_dc->width >> 1 / gr.screen_zoom;
gr.sy = mouse.pos.y - gr.zoomed_dc->height >> 1 / gr.screen_zoom;
gr.sx = mouse.pos.x - GR_WIDTH >> 1 / gr.screen_zoom;
gr.sy = mouse.pos.y - GR_HEIGHT >> 1 / gr.screen_zoom;
GrFixZoomScale;
}
@ -154,7 +154,7 @@ U0 GrZoomInScreen()
GrFixZoomScale;
src = gr.dc2->body + gr.sx + gr.sy * gr.dc2->width_internal;
src = gr.dc2->body + gr.sx + gr.sy * GR_WIDTH;
dst = gr.zoomed_dc->body;
for (i = 0; i < GR_HEIGHT / gr.screen_zoom; i++)
@ -359,34 +359,35 @@ U0 DCBlotColor8(CDC *dc, CDC *img)
U0 GrCalcScreenUpdates()
{
U8 *screen, *last_screen = gr.screen_cache;
U32 i, *src = text.raw_screen, *dst = text.fb_alias, diffs_size = GR_WIDTH * GR_HEIGHT;
U64 x, y, w = sys_framebuffer_pitch / (sys_framebuffer_bpp / 8);
U8 *screen, reg RCX *last_screen = gr.screen_cache;
U32 *src = text.raw_screen, *dst = text.fb_alias;
U64 i, j, x, y, yi;
if (gr.screen_zoom == 1)
screen = gr.dc2->body;
else
screen = gr.zoomed_dc->body;
for (y = 0; y < GR_HEIGHT; y++)
for (y = yi = 0; y < GR_HEIGHT; yi = ++y * GR_WIDTH)
{
for (x = 0; x < GR_WIDTH; x++)
{
i = x + y * GR_WIDTH;
i = x + yi;
j = x + y * sys_framebuffer_pidth;
if (screen[i] != last_screen[i])
{
dst = text.fb_alias + x + y * w;
src = text.raw_screen + x + y * w;
dst = text.fb_alias + j;
src = text.raw_screen + j;
*dst = *src;
}
}
}
MemCopy(gr.screen_cache, screen, diffs_size);
MemCopy(gr.screen_cache, screen, GR_WIDTH * GR_HEIGHT);
}
U0 GrUpdateScreen32()
{
U64 x, y, wi, yi, w = sys_framebuffer_pitch / (sys_framebuffer_bpp / 8);
U64 x, y, j, i;
U32 *dst;
U8 *src;
@ -397,12 +398,12 @@ U0 GrUpdateScreen32()
GrZoomInScreen;
src = gr.zoomed_dc->body;
}
for (y = 0; y < GR_HEIGHT; y++)
for (y = j = i = 0; y < GR_HEIGHT; j = ++y * sys_framebuffer_pidth, i = y * GR_WIDTH)
{
for (x = 0; x < GR_WIDTH; x++)
{
dst = text.raw_screen + x + y * w;
*dst = gr_palette[src[x + y * GR_WIDTH] & 0xFF];
dst = text.raw_screen + x + j;
*dst = gr_palette[src[x + i] & 0xFF];
}
}
@ -430,6 +431,6 @@ U0 GrUpdateScreen()
(*gr.fp_final_screen_update)(dc);
DCDel(dc);
DCBlotColor4(gr.dc1->body, gr.dc2->body, gr.dc_cache->body, gr.dc2->height * gr.dc2->width_internal >> 3);
DCBlotColor4(gr.dc1->body, gr.dc2->body, gr.dc_cache->body, GR_HEIGHT * GR_WIDTH >> 3);
GrUpdateScreen32;
}