anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1466 from Nanquitas/black-fillcolor

Browse Source 
Rosalina: ignore fillcolor when opening the menu
This commit is contained in:
TuxSH 2020-11-17 01:30:24 +00:00 committed by GitHub
commit c058e3f446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysmodules/rosalina/include/draw.h
View File

@ -55,7 +55,11 @@
#define GPU_CMDLIST_CNT REG32(0x104018F0) #define GPU_CMDLIST_CNT REG32(0x104018F0)
#define LCD_TOP_BRIGHTNESS REG32(0x10202240) #define LCD_TOP_BRIGHTNESS REG32(0x10202240)
#define LCD_TOP_FILLCOLOR REG32(0x10202204)
#define LCD_BOT_BRIGHTNESS REG32(0x10202A40) #define LCD_BOT_BRIGHTNESS REG32(0x10202A40)
#define LCD_BOT_FILLCOLOR REG32(0x10202A04)
#define LCD_FILLCOLOR_ENABLE (1u << 24)
#define FB_BOTTOM_VRAM_ADDR ((void *)0x1F48F000) // cached #define FB_BOTTOM_VRAM_ADDR ((void *)0x1F48F000) // cached
#define FB_BOTTOM_VRAM_PA 0x1848F000 #define FB_BOTTOM_VRAM_PA 0x1848F000

8
sysmodules/rosalina/source/draw.c
View File

@ -36,7 +36,7 @@
#define KERNPA2VA(a) ((a) + (GET_VERSION_MINOR(osGetKernelVersion()) < 44 ? 0xD0000000 : 0xC0000000)) #define KERNPA2VA(a) ((a) + (GET_VERSION_MINOR(osGetKernelVersion()) < 44 ? 0xD0000000 : 0xC0000000))
static u32 gpuSavedFramebufferAddr1, gpuSavedFramebufferAddr2, gpuSavedFramebufferFormat, gpuSavedFramebufferStride; static u32 gpuSavedFramebufferAddr1, gpuSavedFramebufferAddr2, gpuSavedFramebufferFormat, gpuSavedFramebufferStride, gpuSavedFillColor;
static u32 framebufferCacheSize; static u32 framebufferCacheSize;
static void *framebufferCache; static void *framebufferCache;
static RecursiveLock lock; static RecursiveLock lock;
@ -203,6 +203,9 @@ u32 Draw_SetupFramebuffer(void)
GPU_FB_BOTTOM_ADDR_1 = GPU_FB_BOTTOM_ADDR_2 = FB_BOTTOM_VRAM_PA; GPU_FB_BOTTOM_ADDR_1 = GPU_FB_BOTTOM_ADDR_2 = FB_BOTTOM_VRAM_PA;
GPU_FB_BOTTOM_FMT = format; GPU_FB_BOTTOM_FMT = format;
GPU_FB_BOTTOM_STRIDE = 240 * 2; GPU_FB_BOTTOM_STRIDE = 240 * 2;
gpuSavedFillColor = LCD_BOT_FILLCOLOR;
LCD_BOT_FILLCOLOR = 0;
return framebufferCacheSize; return framebufferCacheSize;
} }
@ -211,7 +214,8 @@ void Draw_RestoreFramebuffer(void)
{ {
memcpy(FB_BOTTOM_VRAM_ADDR, framebufferCache, FB_BOTTOM_SIZE); memcpy(FB_BOTTOM_VRAM_ADDR, framebufferCache, FB_BOTTOM_SIZE);
Draw_FlushFramebuffer(); Draw_FlushFramebuffer();
LCD_BOT_FILLCOLOR = gpuSavedFillColor;
GPU_FB_BOTTOM_ADDR_1 = gpuSavedFramebufferAddr1; GPU_FB_BOTTOM_ADDR_1 = gpuSavedFramebufferAddr1;
GPU_FB_BOTTOM_ADDR_2 = gpuSavedFramebufferAddr2; GPU_FB_BOTTOM_ADDR_2 = gpuSavedFramebufferAddr2;
GPU_FB_BOTTOM_FMT = gpuSavedFramebufferFormat; GPU_FB_BOTTOM_FMT = gpuSavedFramebufferFormat;