From 7551bf103e2cdceb95a85330772b1ebfb7cf9a85 Mon Sep 17 00:00:00 2001 From: damdoum Date: Sun, 4 Feb 2007 22:58:50 +0000 Subject: [PATCH] adding GDKGLEXT --- desmume/src/GPU.c | 6 +++--- desmume/src/GPU.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/desmume/src/GPU.c b/desmume/src/GPU.c index dfb503133..850bd145a 100644 --- a/desmume/src/GPU.c +++ b/desmume/src/GPU.c @@ -50,8 +50,8 @@ ARM9_struct ARM9Mem; extern BOOL click; -Screen MainScreen; -Screen SubScreen; +NDS_Screen MainScreen; +NDS_Screen SubScreen; //#define DEBUG_TRI @@ -1495,7 +1495,7 @@ void calc_bright_colors() { #undef FORMULA_LESS } -void GPU_ligne(Screen * screen, u16 l) +void GPU_ligne(NDS_Screen * screen, u16 l) { struct _DISPCAPCNT * capcnt; GPU * gpu = screen->gpu; diff --git a/desmume/src/GPU.h b/desmume/src/GPU.h index e5add1f77..bb836c3f1 100644 --- a/desmume/src/GPU.h +++ b/desmume/src/GPU.h @@ -474,10 +474,10 @@ extern void (*modeRender[8][4])(GPU * gpu, u8 num, u16 l, u8 * DST); typedef struct { GPU * gpu; u16 offset; -} Screen; +} NDS_Screen; -extern Screen MainScreen; -extern Screen SubScreen; +extern NDS_Screen MainScreen; +extern NDS_Screen SubScreen; int Screen_Init(int coreid); void Screen_Reset(void); @@ -547,7 +547,7 @@ void GPU_addBack(GPU *, u8 num); int GPU_ChangeGraphicsCore(int coreid); void GPU_set_DISPCAPCNT(GPU * gpu, u32 val) ; -void GPU_ligne(Screen * screen, u16 l) ; +void GPU_ligne(NDS_Screen * screen, u16 l) ; #ifdef __cplusplus }