[vba-commit] VisualBoyAdvance/src Gfx.h,1.18,1.19

[Sébastien G. <kx...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14480

Modified Files:
	Gfx.h 
Log Message:
FIX: fixed compilation issues on Linux

Index: Gfx.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Gfx.h	25 Aug 2006 14:50:53 -0000	1.18
--- Gfx.h	3 Sep 2006 22:57:09 -0000	1.19
***************
*** 29,69 ****
  //#define SPRITE_DEBUG
  
! void gfxDrawTextScreen(u16, u16, u16, u32 *);
! void gfxDrawRotScreen(u16,
!                       u16, u16,
!                       u16, u16,
!                       u16, u16,
!                       u16, u16,
!                       int&, int&,
!                       int,
!                       u32*);
! void gfxDrawRotScreen16Bit(u16,
!                            u16, u16,
!                            u16, u16,
!                            u16, u16,
!                            u16, u16,
!                            int&, int&,
!                            int,
!                            u32*);
! void gfxDrawRotScreen256(u16,
!                          u16, u16,
!                          u16, u16,
!                          u16, u16,
!                          u16, u16,
!                          int&, int&,
!                          int,
!                          u32*);
! void gfxDrawRotScreen16Bit160(u16,
!                               u16, u16,
!                               u16, u16,
!                               u16, u16,
!                               u16, u16,
!                               int&, int&,
!                               int,
!                               u32*);
! void gfxDrawSprites(u32 *);
! void gfxIncreaseBrightness(u32 *line, int coeff);
! void gfxDecreaseBrightness(u32 *line, int coeff);
! void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb);
  
  void mode0RenderLine();
--- 29,69 ----
  //#define SPRITE_DEBUG
  
! static void gfxDrawTextScreen(u16, u16, u16, u32 *);
! static void gfxDrawRotScreen(u16,
! 			     u16, u16,
! 			     u16, u16,
! 			     u16, u16,
! 			     u16, u16,
! 			     int&, int&,
! 			     int,
! 			     u32*);
! static void gfxDrawRotScreen16Bit(u16,
! 				  u16, u16,
! 				  u16, u16,
! 				  u16, u16,
! 				  u16, u16,
! 				  int&, int&,
! 				  int,
! 				  u32*);
! static void gfxDrawRotScreen256(u16,
! 				u16, u16,
! 				u16, u16,
! 				u16, u16,
! 				u16, u16,
! 				int&, int&,
! 				int,
! 				u32*);
! static void gfxDrawRotScreen16Bit160(u16,
! 				     u16, u16,
! 				     u16, u16,
! 				     u16, u16,
! 				     u16, u16,
! 				     int&, int&,
! 				     int,
! 				     u32*);
! static void gfxDrawSprites(u32 *);
! static void gfxIncreaseBrightness(u32 *line, int coeff);
! static void gfxDecreaseBrightness(u32 *line, int coeff);
! static void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb);
  
  void mode0RenderLine();
***************
*** 116,120 ****
  extern int gfxLastVCOUNT;
  
! inline void gfxClearArray(u32 *array)
  {
    for(int i = 0; i < 240; i++) {
--- 116,120 ----
  extern int gfxLastVCOUNT;
  
! static inline void gfxClearArray(u32 *array)
  {
    for(int i = 0; i < 240; i++) {
***************
*** 123,128 ****
  }
  
! inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs,
!                               u32 *line)
  {
    u16 *palette = (u16 *)paletteRAM;
--- 123,128 ----
  }
  
! static inline void gfxDrawTextScreen(u16 control, u16 hofs, u16 vofs,
! 				     u32 *line)
  {
    u16 *palette = (u16 *)paletteRAM;
***************
*** 268,279 ****
  }
  
! inline void gfxDrawRotScreen(u16 control, 
!                              u16 x_l, u16 x_h,
!                              u16 y_l, u16 y_h,
!                              u16 pa,  u16 pb,
!                              u16 pc,  u16 pd,
!                              int& currentX, int& currentY,
!                              int changed,
!                              u32 *line)
  {
    u16 *palette = (u16 *)paletteRAM;
--- 268,279 ----
  }
  
! static inline void gfxDrawRotScreen(u16 control, 
! 				    u16 x_l, u16 x_h,
! 				    u16 y_l, u16 y_h,
! 				    u16 pa,  u16 pb,
! 				    u16 pc,  u16 pd,
! 				    int& currentX, int& currentY,
! 				    int changed,
! 				    u32 *line)
  {
    u16 *palette = (u16 *)paletteRAM;
***************
*** 434,445 ****
  }
  
! inline void gfxDrawRotScreen16Bit(u16 control,
!                                   u16 x_l, u16 x_h,
!                                   u16 y_l, u16 y_h,
!                                   u16 pa,  u16 pb,
!                                   u16 pc,  u16 pd,
!                                   int& currentX, int& currentY,
!                                   int changed,
!                                   u32 *line)
  {
    u16 *screenBase = (u16 *)&vram[0];
--- 434,445 ----
  }
  
! static inline void gfxDrawRotScreen16Bit(u16 control,
! 					 u16 x_l, u16 x_h,
! 					 u16 y_l, u16 y_h,
! 					 u16 pa,  u16 pb,
! 					 u16 pc,  u16 pd,
! 					 int& currentX, int& currentY,
! 					 int changed,
! 					 u32 *line)
  {
    u16 *screenBase = (u16 *)&vram[0];
***************
*** 531,542 ****
  }
  
! inline void gfxDrawRotScreen256(u16 control, 
!                                 u16 x_l, u16 x_h,
!                                 u16 y_l, u16 y_h,
!                                 u16 pa,  u16 pb,
!                                 u16 pc,  u16 pd,
!                                 int &currentX, int& currentY,
!                                 int changed,
!                                 u32 *line)
  {
    u16 *palette = (u16 *)paletteRAM;
--- 531,542 ----
  }
  
! static inline void gfxDrawRotScreen256(u16 control, 
! 				       u16 x_l, u16 x_h,
! 				       u16 y_l, u16 y_h,
! 				       u16 pa,  u16 pb,
! 				       u16 pc,  u16 pd,
! 				       int &currentX, int& currentY,
! 				       int changed,
! 				       u32 *line)
  {
    u16 *palette = (u16 *)paletteRAM;
***************
*** 632,643 ****
  }
  
! inline void gfxDrawRotScreen16Bit160(u16 control,
!                                      u16 x_l, u16 x_h,
!                                      u16 y_l, u16 y_h,
!                                      u16 pa,  u16 pb,
!                                      u16 pc,  u16 pd,
!                                      int& currentX, int& currentY,
!                                      int changed,
!                                      u32 *line)
  {
    u16 *screenBase = (DISPCNT & 0x0010) ? (u16 *)&vram[0xa000] :
--- 632,643 ----
  }
  
! static inline void gfxDrawRotScreen16Bit160(u16 control,
! 					    u16 x_l, u16 x_h,
! 					    u16 y_l, u16 y_h,
! 					    u16 pa,  u16 pb,
! 					    u16 pc,  u16 pd,
! 					    int& currentX, int& currentY,
! 					    int changed,
! 					    u32 *line)
  {
    u16 *screenBase = (DISPCNT & 0x0010) ? (u16 *)&vram[0xa000] :
***************
*** 731,735 ****
  }
  
! inline void gfxDrawSprites(u32 *lineOBJ)
  {
    // lineOBJpix is used to keep track of the drawn OBJs
--- 731,735 ----
  }
  
! static inline void gfxDrawSprites(u32 *lineOBJ)
  {
    // lineOBJpix is used to keep track of the drawn OBJs
***************
*** 1194,1198 ****
  }
  
! inline void gfxDrawOBJWin(u32 *lineOBJWin)
  {
    gfxClearArray(lineOBJWin);
--- 1194,1198 ----
  }
  
! static inline void gfxDrawOBJWin(u32 *lineOBJWin)
  {
    gfxClearArray(lineOBJWin);
***************
*** 1513,1517 ****
  }
  
! inline u32 gfxIncreaseBrightness(u32 color, int coeff)
  {
    int r = (color & 0x1F);
--- 1513,1517 ----
  }
  
! static inline u32 gfxIncreaseBrightness(u32 color, int coeff)
  {
    int r = (color & 0x1F);
***************
*** 1532,1536 ****
  }
  
! inline void gfxIncreaseBrightness(u32 *line, int coeff)
  {
    for(int x = 0; x < 240; x++) {
--- 1532,1536 ----
  }
  
! static inline void gfxIncreaseBrightness(u32 *line, int coeff)
  {
    for(int x = 0; x < 240; x++) {
***************
*** 1553,1557 ****
  }
  
! inline u32 gfxDecreaseBrightness(u32 color, int coeff)
  {
    int r = (color & 0x1F);
--- 1553,1557 ----
  }
  
! static inline u32 gfxDecreaseBrightness(u32 color, int coeff)
  {
    int r = (color & 0x1F);
***************
*** 1573,1577 ****
  }
  
! inline void gfxDecreaseBrightness(u32 *line, int coeff)
  {
    for(int x = 0; x < 240; x++) {
--- 1573,1577 ----
  }
  
! static inline void gfxDecreaseBrightness(u32 *line, int coeff)
  {
    for(int x = 0; x < 240; x++) {
***************
*** 1594,1598 ****
  }
  
! inline u32 gfxAlphaBlend(u32 color, u32 color2, int ca, int cb)
  {
    if(color < 0x80000000) {
--- 1594,1598 ----
  }
  
! static inline u32 gfxAlphaBlend(u32 color, u32 color2, int ca, int cb)
  {
    if(color < 0x80000000) {
***************
*** 1620,1624 ****
  }
  
! inline void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb)
  {
    for(int x = 0; x < 240; x++) {
--- 1620,1624 ----
  }
  
! static inline void gfxAlphaBlend(u32 *ta, u32 *tb, int ca, int cb)
  {
    for(int x = 0; x < 240; x++) {