Patch 10767 (Durandal_1707).

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

1 files changed, 48 insertions, 48 deletions

diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c
index b0cbc290..ebe02760 100644
--- a/plugins/dfxvideo/soft.c
+++ b/plugins/dfxvideo/soft.c
@@ -240,7 +240,7 @@ void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned s
 /////////////////////////////////////////////////////////////////

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

 

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

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

 {

  int32_t r,g,b;

 

@@ -304,7 +304,7 @@ __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_
 

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

 

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

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

 {

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

 

@@ -363,7 +363,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)

   {

@@ -450,7 +450,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)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -523,7 +523,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)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -544,7 +544,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)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -617,7 +617,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)

 {

  int32_t r,g,b,l;

 

@@ -721,7 +721,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)

 {

  int32_t r,g,b;

 

@@ -746,7 +746,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)

 {

  int32_t r,g,b;

 

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

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

 

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

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

 {

  int32_t r,g,b;

 

@@ -919,7 +919,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)

 {

  int32_t r,g,b;unsigned short l;

 

@@ -991,7 +991,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)

 {

  int32_t r,g,b;

 

@@ -1010,7 +1010,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)

 {

  int32_t r,g,b;

  

@@ -1205,11 +1205,11 @@ static int left_B, delta_left_B, right_B, delta_right_B;
 // NASM version (external):

 #define shl10idiv i386_shl10idiv

 

-__inline int shl10idiv(int x, int y);

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

 

 #else

 

-__inline int shl10idiv(int x, int y)

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

 {

  __int64 bi=x;

  bi<<=10;

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

 // GNUC long long int version:

 

-__inline int shl10idiv(int x, int y) 

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

 { 

  long long int bi=x; 

  bi<<=10; 

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

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

                         

-__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 ];

@@ -1251,7 +1251,7 @@ __inline int RightSection_F(void)
 

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

 

-__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 ];

@@ -1267,7 +1267,7 @@ __inline int LeftSection_F(void)
 

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

 

-__inline BOOL NextRow_F(void)

+static __inline BOOL NextRow_F(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1293,7 +1293,7 @@ __inline BOOL NextRow_F(void)
 

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

 

-__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;

@@ -1355,7 +1355,7 @@ __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////

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

 

-__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 ];

@@ -1371,7 +1371,7 @@ __inline int RightSection_G(void)
 

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

 

-__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 ];

@@ -1394,7 +1394,7 @@ __inline int LeftSection_G(void)
 

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

 

-__inline BOOL NextRow_G(void)

+static __inline BOOL NextRow_G(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1423,7 +1423,7 @@ __inline BOOL NextRow_G(void)
 

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

 

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

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

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1501,7 +1501,7 @@ __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short
 ////////////////////////////////////////////////////////////////////////

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

 

-__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 ];

@@ -1517,7 +1517,7 @@ __inline int RightSection_FT(void)
 

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

 

-__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 ];

@@ -1538,7 +1538,7 @@ __inline int LeftSection_FT(void)
 

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

 

-__inline BOOL NextRow_FT(void)

+static __inline BOOL NextRow_FT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1566,7 +1566,7 @@ __inline BOOL NextRow_FT(void)
 

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

 

-__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;

@@ -1654,7 +1654,7 @@ texture distortions
 ////////////////////////////////////////////////////////////////////////

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

 

-__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 ];

@@ -1670,7 +1670,7 @@ __inline int RightSection_GT(void)
 

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

 

-__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 ];

@@ -1698,7 +1698,7 @@ __inline int LeftSection_GT(void)
 

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

 

-__inline BOOL NextRow_GT(void)

+static __inline BOOL NextRow_GT(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1729,7 +1729,7 @@ __inline BOOL NextRow_GT(void)
 

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

 

-__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, int32_t rgb1, int32_t rgb2, int32_t 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, int32_t rgb1, int32_t rgb2, int32_t rgb3)

 {

  soft_vertex * v1, * v2, * v3;

  int height,longest,temp;

@@ -1834,7 +1834,7 @@ texture distortions
 ////////////////////////////////////////////////////////////////////////

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

 

-__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 ];

@@ -1853,7 +1853,7 @@ __inline int RightSection_F4(void)
 

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

 

-__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 ];

@@ -1872,7 +1872,7 @@ __inline int LeftSection_F4(void)
 

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

 

-__inline BOOL NextRow_F4(void)

+static __inline BOOL NextRow_F4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -1904,7 +1904,7 @@ __inline BOOL NextRow_F4(void)
 

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

 

-__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;

@@ -2046,7 +2046,7 @@ __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3,
 ////////////////////////////////////////////////////////////////////////

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

 

-__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 ];

@@ -2069,7 +2069,7 @@ __inline int RightSection_FT4(void)
 

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

 

-__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 ];

@@ -2092,7 +2092,7 @@ __inline int LeftSection_FT4(void)
 

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

 

-__inline BOOL NextRow_FT4(void)

+static __inline BOOL NextRow_FT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2128,7 +2128,7 @@ __inline BOOL NextRow_FT4(void)
 

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

 

-__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;

@@ -2277,7 +2277,7 @@ __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3
 ////////////////////////////////////////////////////////////////////////

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

 

-__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 ];

@@ -2307,7 +2307,7 @@ __inline int RightSection_GT4(void)
 

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

 

-__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 ];

@@ -2337,7 +2337,7 @@ __inline int LeftSection_GT4(void)
 

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

 

-__inline BOOL NextRow_GT4(void)

+static __inline BOOL NextRow_GT4(void)

 {

  if(--left_section_height<=0) 

   {

@@ -2379,7 +2379,7 @@ __inline BOOL NextRow_GT4(void)
 

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

 

-__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,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t 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,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)

 {

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

  int height,width,longest1,longest2;

@@ -2549,7 +2549,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,int32_t rgb)

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

 {

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

  unsigned short color;uint32_t lcolor;

@@ -5187,7 +5187,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,int32_t rgb1, int32_t rgb2, int32_t rgb3)

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

 {

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

  int32_t cR1,cG1,cB1;

@@ -7086,7 +7086,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;

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

 

 // real rect test

-__inline BOOL IsNoRect(void)

+static __inline BOOL IsNoRect(void)

 {

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