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

Merge branch 'master' into actions

Browse source
This commit is contained in:
Slendi 2023-03-02 17:18:45 +02:00 committed by GitHub
commit dff361a2fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -395,10 +395,16 @@ U0 GrUpdateScreen32()
while (src < size) //draw 2 pixels at a time while (src < size) //draw 2 pixels at a time
*dst++ = gr_palette[*src++ & 0xFF] | gr_palette[*src++ & 0xFF] << 32; *dst++ = gr_palette[*src++ & 0xFF] | gr_palette[*src++ & 0xFF] << 32;
GrCalcScreenUpdates;
if (LBtr(&sys_semas[SEMA_FLUSH_VBE_IMAGE], 0)) if (LBtr(&sys_semas[SEMA_FLUSH_VBE_IMAGE], 0))
{
MemCopy(text.fb_alias, text.raw_screen, text.buffer_size); MemCopy(text.fb_alias, text.raw_screen, text.buffer_size);
src -= GR_WIDTH * GR_HEIGHT; // Reset src ptr
MemCopy(gr.screen_cache, src, GR_WIDTH * GR_HEIGHT);
}
else
{
GrCalcScreenUpdates;
}
} }
U0 GrUpdateScreen() U0 GrUpdateScreen()

2
src/System/Utils/ConversionScript.ZC
View file

@ -41,7 +41,7 @@ U0 Cvt(U8 *ff_mask="*", U8 *fu_flags="+r+l-i+S")
Find("ExtDft", ff_mask, fu_flags, "ExtDefault"); Find("ExtDft", ff_mask, fu_flags, "ExtDefault");
Find("ExtChg", ff_mask, fu_flags, "ExtChange"); Find("ExtChg", ff_mask, fu_flags, "ExtChange");
Find("RegDft", ff_mask, fu_flags, "RegDefault"); Find("RegDft", ff_mask, fu_flags, "RegDefault");
Find("\"HC\"", ff_mask, fu_flags, "\"CC\""); Find("\"HC\"", ff_mask, fu_flags, "\"ZC\"");
Find("CDrv", ff_mask, fu_flags, "CDrive"); Find("CDrv", ff_mask, fu_flags, "CDrive");
Find("CDbgInfo", ff_mask, fu_flags, "CDebugInfo"); Find("CDbgInfo", ff_mask, fu_flags, "CDebugInfo");
Find("dbg_info", ff_mask, fu_flags, "debug_info"); Find("dbg_info", ff_mask, fu_flags, "debug_info");