Patch 10767 (Durandal_1707).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72138 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 47 insertions, 47 deletions

diff --git a/plugins/peopsxgl/soft.c b/plugins/peopsxgl/soft.c
index 9f10a2a0..9f5a4012 100644
--- a/plugins/peopsxgl/soft.c
+++ b/plugins/peopsxgl/soft.c
@@ -232,7 +232,7 @@ void Dither16(unsigned short *pdest, uint32_t r, uint32_t g, uint32_t b, unsigne
 

 /////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)

+static __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)

 {

  int r,g,b;

 

@@ -296,7 +296,7 @@ __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)

+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)

 {

  if(bCheckMask && *pdest&0x8000) return;

 

@@ -355,7 +355,7 @@ __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)

+static __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)

 {

  if (DrawSemiTrans)

   {

@@ -442,7 +442,7 @@ __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)

 {

  int r,g,b;unsigned short l;

 

@@ -515,7 +515,7 @@ __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)

 {

  int r,g,b;unsigned short l;

 

@@ -537,7 +537,7 @@ __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)

+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)

 {

  int r,g,b;unsigned short l;

 

@@ -610,7 +610,7 @@ __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short colo
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)

+static __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)

 {

  int r,g,b,l;

 

@@ -714,7 +714,7 @@ __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)

+static __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)

 {

  int r,g,b;

 

@@ -739,7 +739,7 @@ __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)

+static __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)

 {

  int r,g,b;

 

@@ -841,7 +841,7 @@ __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)

+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)

 {

  int r,g,b;

 

@@ -912,7 +912,7 @@ __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

 {

  int r,g,b;unsigned short l;

 

@@ -984,7 +984,7 @@ __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,s
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)

 {

  int r,g,b;

 

@@ -1003,7 +1003,7 @@ __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color
 

 ////////////////////////////////////////////////////////////////////////

 

-__inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)

+static __inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)

 {

  int r,g,b;

  

@@ -1192,7 +1192,7 @@ static int left_B, delta_left_B, right_B, delta_right_B;
 

 #pragma warning  (disable : 4035)

 

-__inline int shl10idiv(int x, int y)

+static __inline int shl10idiv(int x, int y)

 {

  __asm

   {

@@ -1208,7 +1208,7 @@ __inline int shl10idiv(int x, int y)
 

 #else

 

-__inline int shl10idiv(int x, int y)

+static __inline int shl10idiv(int x, int y)

 {

  long long int bi=x;

  bi<<=10;

@@ -1217,7 +1217,7 @@ __inline int shl10idiv(int x, int y)
 

 #endif

 

-__inline int RightSection_F(void)

+static __inline int RightSection_F(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1231,7 +1231,7 @@ __inline int RightSection_F(void)
  return height;

 }

 

-__inline int LeftSection_F(void)

+static __inline int LeftSection_F(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1245,7 +1245,7 @@ __inline int LeftSection_F(void)
  return height;  

 }

 

-__inline BOOL NextRow_F(void)

+static __inline BOOL NextRow_F(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1269,7 +1269,7 @@ __inline BOOL NextRow_F(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)

+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest;

@@ -1328,7 +1328,7 @@ __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3,
  return TRUE;

 }

 

-__inline int RightSection_G(void)

+static __inline int RightSection_G(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1342,7 +1342,7 @@ __inline int RightSection_G(void)
  return height;

 }

 

-__inline int LeftSection_G(void)

+static __inline int LeftSection_G(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1363,7 +1363,7 @@ __inline int LeftSection_G(void)
  return height;  

 }

 

-__inline BOOL NextRow_G(void)

+static __inline BOOL NextRow_G(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1390,7 +1390,7 @@ __inline BOOL NextRow_G(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){

+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){

  soft_vertex *v1, *v2, *v3;

  int height, longest, temp;

 

@@ -1464,7 +1464,7 @@ __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short
  return TRUE;

 }

 

-__inline int RightSection_FT(void)

+static __inline int RightSection_FT(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1478,7 +1478,7 @@ __inline int RightSection_FT(void)
  return height;

 }

 

-__inline int LeftSection_FT(void)

+static __inline int LeftSection_FT(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1497,7 +1497,7 @@ __inline int LeftSection_FT(void)
  return height;  

 }

 

-__inline BOOL NextRow_FT(void)

+static __inline BOOL NextRow_FT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1523,7 +1523,7 @@ __inline BOOL NextRow_FT(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1608,7 +1608,7 @@ texture distortions
  return TRUE;

 }

 

-__inline int RightSection_GT(void)

+static __inline int RightSection_GT(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1622,7 +1622,7 @@ __inline int RightSection_GT(void)
  return height;

 }

 

-__inline int LeftSection_GT(void)

+static __inline int LeftSection_GT(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1648,7 +1648,7 @@ __inline int LeftSection_GT(void)
  return height;  

 }

 

-__inline BOOL NextRow_GT(void)

+static __inline BOOL NextRow_GT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1677,7 +1677,7 @@ __inline BOOL NextRow_GT(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)

+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1779,7 +1779,7 @@ texture distortions
  return TRUE;

 }

 

-__inline int RightSection_F4(void)

+static __inline int RightSection_F4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -1796,7 +1796,7 @@ __inline int RightSection_F4(void)
  return height;

 }

 

-__inline int LeftSection_F4(void)

+static __inline int LeftSection_F4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -1813,7 +1813,7 @@ __inline int LeftSection_F4(void)
  return height;  

 }

 

-__inline BOOL NextRow_F4(void)

+static __inline BOOL NextRow_F4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1843,7 +1843,7 @@ __inline BOOL NextRow_F4(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)

+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -1982,7 +1982,7 @@ __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
  return TRUE;

 }

 

-__inline int RightSection_FT4(void)

+static __inline int RightSection_FT4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -2003,7 +2003,7 @@ __inline int RightSection_FT4(void)
  return height;

 }

 

-__inline int LeftSection_FT4(void)

+static __inline int LeftSection_FT4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -2024,7 +2024,7 @@ __inline int LeftSection_FT4(void)
  return height;  

 }

 

-__inline BOOL NextRow_FT4(void)

+static __inline BOOL NextRow_FT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2058,7 +2058,7 @@ __inline BOOL NextRow_FT4(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -2204,7 +2204,7 @@ __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3
  return TRUE;

 }

 

-__inline int RightSection_GT4(void)

+static __inline int RightSection_GT4(void)

 {

  soft_vertex * v1 = right_array[ right_section ];

  soft_vertex * v2 = right_array[ right_section-1 ];

@@ -2232,7 +2232,7 @@ __inline int RightSection_GT4(void)
  return height;

 }

 

-__inline int LeftSection_GT4(void)

+static __inline int LeftSection_GT4(void)

 {

  soft_vertex * v1 = left_array[ left_section ];

  soft_vertex * v2 = left_array[ left_section-1 ];

@@ -2260,7 +2260,7 @@ __inline int LeftSection_GT4(void)
  return height;  

 }

 

-__inline BOOL NextRow_GT4(void)

+static __inline BOOL NextRow_GT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2300,7 +2300,7 @@ __inline BOOL NextRow_GT4(void)
  return FALSE;

 }

 

-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)

+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)

 {

  soft_vertex * v1, * v2, * v3, * v4;

  int height,width,longest1,longest2;

@@ -2466,7 +2466,7 @@ __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3
 // POLY 3/4 FLAT SHADED

 ////////////////////////////////////////////////////////////////////////

 

-__inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)

+static __inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)

 {

  int i,j,xmin,xmax,ymin,ymax;

  unsigned short color;

@@ -5105,7 +5105,7 @@ void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3
 // POLY 3/4 G-SHADED

 ////////////////////////////////////////////////////////////////////////

  

-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)

+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)

 {

  int i,j,xmin,xmax,ymin,ymax;

  int cR1,cG1,cB1;

@@ -7004,7 +7004,7 @@ void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3,
 

 /*

 // no real rect test, but it does its job the way I need it

-__inline BOOL IsNoRect(void)

+static __inline BOOL IsNoRect(void)

 {

  if(lx0==lx1 && lx2==lx3) return FALSE;

  if(lx0==lx2 && lx1==lx3) return FALSE;

@@ -7014,7 +7014,7 @@ __inline BOOL IsNoRect(void)
 */

 

 // real rect test

-__inline BOOL IsNoRect(void)

+static __inline BOOL IsNoRect(void)

 {

  //if(!(dwActFixes&0x200)) return FALSE;