gpu-gles: schtruck/fpse merge: remove windows code

[pcsx_rearmed.git] / plugins / gpu-gles / gpuTexture.c

diff --git a/plugins/gpu-gles/gpuTexture.c b/plugins/gpu-gles/gpuTexture.c
index 98f8c9c..c3d88f9 100644 (file)
--- a/plugins/gpu-gles/gpuTexture.c
+++ b/plugins/gpu-gles/gpuTexture.c
@@ -67,14 +67,6 @@
  \r
 #define _IN_TEXTURE\r
 \r
-#ifdef _WINDOWS\r
-#include "stdafx.h"\r
-\r
-#include "externals.h"\r
-#include "texture.h"\r
-#include "gpu.h"\r
-#include "prim.h"\r
-#else\r
 #include "gpuStdafx.h"\r
 \r
 #include "gpuDraw.h"\r
@@ -83,7 +75,7 @@
 #include "gpuTexture.h"\r
 #include "gpuPlugin.h"\r
 #include "gpuPrim.h"\r
-#endif\r
+\r
 #define CLUTCHK   0x00060000\r
 #define CLUTSHIFT 17\r
 \r
@@ -98,11 +90,7 @@ GLuint        gTexFrameName=0;
 int           iTexGarbageCollection=1;\r
 unsigned long dwTexPageComp=0;\r
 int           iVRamSize=0;\r
-#ifdef _WINDOWS\r
-int           iClampType=GL_CLAMP;\r
-#else\r
 int           iClampType=GL_CLAMP_TO_EDGE;\r
-#endif\r
 int iFilter = GL_LINEAR;\r
 void               (*LoadSubTexFn) (int,int,short,short);\r
 unsigned long      (*PalTexturedColourFn)  (unsigned long);\r
@@ -139,7 +127,7 @@ unsigned long      (*PalTexturedColourFn)  (unsigned long);
 \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-u8 * CheckTextureInSubSCache(long TextureMode,unsigned long GivenClutId,unsigned short * pCache);\r
+unsigned char * CheckTextureInSubSCache(long TextureMode,unsigned long GivenClutId,unsigned short * pCache);\r
 void            LoadSubTexturePageSort(int pageid, int mode, short cx, short cy);\r
 void            LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy);\r
 void            DefineSubTextureSort(void);\r
@@ -166,10 +154,6 @@ unsigned short (*PTCF[2]) (unsigned short);
 // texture cache implementation\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-#ifdef _WINDOWS\r
-#pragma pack(1)\r
-#endif\r
-\r
 // "texture window" cache entry\r
 \r
 typedef struct textureWndCacheEntryTag\r
@@ -189,15 +173,12 @@ typedef struct textureSubCacheEntryTagS
 {\r
  unsigned long   ClutID;\r
  EXLong          pos;\r
- u8   posTX;\r
- u8   posTY;\r
- u8   cTexID;\r
- u8   Opaque;\r
+ unsigned char   posTX;\r
+ unsigned char   posTY;\r
+ unsigned char   cTexID;\r
+ unsigned char   Opaque;\r
 } textureSubCacheEntryS;\r
 \r
-#ifdef _WINDOWS\r
-#pragma pack()\r
-#endif\r
 \r
 //---------------------------------------------\r
 \r
@@ -220,7 +201,7 @@ int                      iTexWndLimit=MAXWNDTEXCACHE/2;
 GLubyte *                texturepart=NULL;\r
 GLubyte *                texturebuffer=NULL;\r
 unsigned long            g_x1,g_y1,g_x2,g_y2;\r
-u8            ubOpaqueDraw=0;\r
+unsigned char            ubOpaqueDraw=0;\r
 \r
 unsigned short MAXTPAGES     = 32;\r
 unsigned short CLUTMASK      = 0x7fff;\r
@@ -462,7 +443,7 @@ void CheckTextureMemory(void)
 {\r
  GLboolean b;GLboolean * bDetail;\r
  int i,iCnt,iRam=iVRamSize*1024*1024;\r
- int iTSize;s8 * p;\r
+ int iTSize;char * p;\r
 \r
 \r
  if(iVRamSize)\r
@@ -493,7 +474,7 @@ void CheckTextureMemory(void)
 \r
 \r
         iTSize=256;\r
- p=(s8 *)malloc(iTSize*iTSize*4);\r
+ p=(char *)malloc(iTSize*iTSize*4);\r
 \r
  iCnt=0;\r
  glGenTextures(MAXSORTTEX,uiStexturePage);\r
@@ -752,7 +733,7 @@ void InvalidateWndTextureArea(long X,long Y,long W, long H)
 void MarkFree(textureSubCacheEntryS * tsx)\r
 {\r
  EXLong * ul, * uls;\r
- int j,iMax;u8 x1,y1,dx,dy;\r
+ int j,iMax;unsigned char x1,y1,dx,dy;\r
 \r
  uls=pxSsubtexLeft[tsx->cTexID];\r
  iMax=uls->l;ul=uls+1;\r
@@ -926,7 +907,7 @@ void LoadStretchPackedWndTexturePage(int pageid, int mode, short cx, short cy)
  unsigned long start,row,column,j,sxh,sxm,ldx,ldy,ldxo;\r
  unsigned int   palstart;\r
  unsigned short *px,*pa,*ta;\r
- u8  *cSRCPtr,*cOSRCPtr;\r
+ unsigned char  *cSRCPtr,*cOSRCPtr;\r
  unsigned short *wSRCPtr,*wOSRCPtr;\r
  unsigned long  LineOffset;unsigned short s;\r
  int pmult=pageid/16;\r
@@ -1118,7 +1099,7 @@ void LoadStretchWndTexturePage(int pageid, int mode, short cx, short cy)
  unsigned long start,row,column,j,sxh,sxm,ldx,ldy,ldxo,s;\r
  unsigned int   palstart;\r
  unsigned long  *px,*pa,*ta;\r
- u8  *cSRCPtr,*cOSRCPtr;\r
+ unsigned char  *cSRCPtr,*cOSRCPtr;\r
  unsigned short *wSRCPtr,*wOSRCPtr;\r
  unsigned long  LineOffset;\r
  int pmult=pageid/16;\r
@@ -1329,7 +1310,7 @@ void LoadPackedWndTexturePage(int pageid, int mode, short cx, short cy)
  unsigned long start,row,column,j,sxh,sxm;\r
  unsigned int   palstart;\r
  unsigned short *px,*pa,*ta;\r
- u8  *cSRCPtr;\r
+ unsigned char  *cSRCPtr;\r
  unsigned short *wSRCPtr;\r
  unsigned long  LineOffset;\r
  int pmult=pageid/16;\r
@@ -1471,7 +1452,7 @@ void LoadWndTexturePage(int pageid, int mode, short cx, short cy)
  unsigned long start,row,column,j,sxh,sxm;\r
  unsigned int   palstart;\r
  unsigned long  *px,*pa,*ta;\r
- u8  *cSRCPtr;\r
+ unsigned char  *cSRCPtr;\r
  unsigned short *wSRCPtr;\r
  unsigned long  LineOffset;\r
  int pmult=pageid/16;\r
@@ -1679,12 +1660,12 @@ void DefinePalTextureWnd(void)
 void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)\r
 {\r
  unsigned long start,row,column,j,sxh,sxm;\r
- u8  *ta;\r
- u8  *cSRCPtr;\r
+ unsigned char  *ta;\r
+ unsigned char  *cSRCPtr;\r
  unsigned long  LineOffset;\r
  int pmult=pageid/16;\r
 \r
- ta=(u8 *)texturepart;\r
+ ta=(unsigned char *)texturepart;\r
 \r
  switch(mode)\r
   {\r
@@ -1739,15 +1720,15 @@ void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)
 void LoadStretchPalWndTexturePage(int pageid, int mode, short cx, short cy)\r
 {\r
  unsigned long start,row,column,j,sxh,sxm,ldx,ldy,ldxo;\r
- u8  *ta,s;\r
- u8  *cSRCPtr,*cOSRCPtr;\r
+ unsigned char  *ta,s;\r
+ unsigned char  *cSRCPtr,*cOSRCPtr;\r
  unsigned long  LineOffset;\r
  int pmult=pageid/16;\r
 \r
  ldxo=TWin.Position.x1-TWin.OPosition.x1;\r
  ldy =TWin.Position.y1-TWin.OPosition.y1;\r
 \r
- ta=(u8 *)texturepart;\r
+ ta=(unsigned char *)texturepart;\r
 \r
  switch(mode)\r
   {\r
@@ -2006,7 +1987,7 @@ void DefineTextureMovie(void)
 // movie texture: load\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-u8 * LoadDirectMovieFast(void)\r
+unsigned char * LoadDirectMovieFast(void)\r
 {\r
  long row,column;\r
  unsigned int startxy;\r
@@ -2015,13 +1996,13 @@ u8 * LoadDirectMovieFast(void)
 \r
  if(PSXDisplay.RGB24)\r
   {\r
-   u8 * pD;\r
+   unsigned char * pD;\r
 \r
    startxy=((1024)*xrMovieArea.y0)+xrMovieArea.x0;\r
 \r
    for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++,startxy+=1024)\r
     {\r
-     pD=(u8 *)&psxVuw[startxy];\r
+     pD=(unsigned char *)&psxVuw[startxy];\r
      for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)\r
       {\r
        *ta++=*((unsigned long *)pD)|0xff000000;\r
@@ -2058,7 +2039,7 @@ GLuint LoadTextureMovieFast(void)
 {\r
    if(PSXDisplay.RGB24)\r
     {\r
-     u8 * pD;\r
+     unsigned char * pD;\r
      unsigned long * ta=(unsigned long *)texturepart;\r
 \r
      startxy=((1024)*xrMovieArea.y0)+xrMovieArea.x0;\r
@@ -2066,7 +2047,7 @@ GLuint LoadTextureMovieFast(void)
      for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++,startxy+=1024)\r
       {\r
        //startxy=((1024)*column)+xrMovieArea.x0;\r
-       pD=(u8 *)&psxVuw[startxy];\r
+       pD=(unsigned char *)&psxVuw[startxy];\r
        for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)\r
         {\r
          *ta++=*((unsigned long *)pD)|0xff000000;\r
@@ -2114,7 +2095,7 @@ GLuint LoadTextureMovie(void)
 {\r
    if(PSXDisplay.RGB24)\r
     {\r
-     u8 * pD;\r
+     unsigned char * pD;\r
      unsigned long * ta=(unsigned long *)texturepart;\r
 \r
      if(b_X)\r
@@ -2122,7 +2103,7 @@ GLuint LoadTextureMovie(void)
        for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++)\r
         {\r
          startxy=((1024)*column)+xrMovieArea.x0;\r
-         pD=(u8 *)&psxVuw[startxy];\r
+         pD=(unsigned char *)&psxVuw[startxy];\r
          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)\r
           {\r
            *ta++=*((unsigned long *)pD)|0xff000000;\r
@@ -2143,7 +2124,7 @@ GLuint LoadTextureMovie(void)
        for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++)\r
         {\r
          startxy=((1024)*column)+xrMovieArea.x0;\r
-         pD=(u8 *)&psxVuw[startxy];\r
+         pD=(unsigned char *)&psxVuw[startxy];\r
          for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)\r
           {\r
            *ta++=*((unsigned long *)pD)|0xff000000;\r
@@ -2327,7 +2308,7 @@ GLuint Fake15BitTexture(void)
 \r
  if(!gTexFrameName)\r
   {\r
-   s8 * p;\r
+   char * p;\r
 \r
    if(iResX>1280 || iResY>1024) iFTex=2048;\r
    else\r
@@ -2343,7 +2324,7 @@ GLuint Fake15BitTexture(void)
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, iFilter);\r
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, iFilter);\r
 \r
-   p=(s8 *)malloc(iFTex*iFTex*4);\r
+   p=(char *)malloc(iFTex*iFTex*4);\r
    memset(p,0,iFTex*iFTex*4);\r
    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, iFTex, iFTex, 0, GL_RGBA, GL_UNSIGNED_BYTE, p);\r
    free(p);\r
@@ -2431,7 +2412,7 @@ GLuint Fake15BitTexture(void)
 \r
  if(glGetError()) \r
   {\r
-   s8 * p=(s8 *)malloc(iFTex*iFTex*4);\r
+   char * p=(char *)malloc(iFTex*iFTex*4);\r
    memset(p,0,iFTex*iFTex*4);\r
    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, iFTex, iFTex,\r
                    GL_RGBA, GL_UNSIGNED_BYTE, p);\r
@@ -2465,7 +2446,7 @@ void LoadSubTexturePageSort(int pageid, int mode, short cx, short cy)
  unsigned long  start,row,column,j,sxh,sxm;\r
  unsigned int   palstart;\r
  unsigned long  *px,*pa,*ta;\r
- u8  *cSRCPtr;\r
+ unsigned char  *cSRCPtr;\r
  unsigned short *wSRCPtr;\r
  unsigned long  LineOffset;\r
  unsigned long  x2a,xalign=0;\r
@@ -2793,7 +2774,7 @@ void LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy)
  unsigned long  start,row,column,j,sxh,sxm;\r
  unsigned int   palstart;\r
  unsigned short *px,*pa,*ta;\r
- u8  *cSRCPtr;\r
+ unsigned char  *cSRCPtr;\r
  unsigned short *wSRCPtr;\r
  unsigned long  LineOffset;\r
  unsigned long  x2a,xalign=0;\r
@@ -3109,8 +3090,8 @@ void LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy)
 \r
 #define Q_INTERPOLATE8(A, B, C, D) (((((A & qcolorMask8) >> 2) + ((B & qcolorMask8) >> 2) + ((C & qcolorMask8) >> 2) + ((D & qcolorMask8) >> 2) + ((((A & qlowpixelMask8) + (B & qlowpixelMask8) + (C & qlowpixelMask8) + (D & qlowpixelMask8)) >> 2) & qlowpixelMask8))|((((A&0xFF000000)==0x50000000)?0x50000000:(((B&0xFF000000)==0x50000000)?0x50000000:(((C&0xFF000000)==0x50000000)?0x50000000:(((D&0xFF000000)==0x50000000)?0x50000000:(((A&0xFF000000)==0x00000000)?0x00000000:(((B&0xFF000000)==0x00000000)?0x00000000:(((C&0xFF000000)==0x00000000)?0x00000000:(((D&0xFF000000)==0x00000000)?0x00000000:0xFF000000)))))))))))\r
 \r
-void Super2xSaI_ex8_Ex(u8 *srcPtr, DWORD srcPitch,\r
-                   u8  *dstBitmap, int width, int height)\r
+void Super2xSaI_ex8_Ex(unsigned char *srcPtr, DWORD srcPitch,\r
+                   unsigned char  *dstBitmap, int width, int height)\r
 {\r
  DWORD dstPitch = srcPitch * 2;\r
  DWORD line;\r
@@ -3254,8 +3235,8 @@ void Super2xSaI_ex8_Ex(u8 *srcPtr, DWORD srcPitch,
 }\r
 \r
 \r
-void Super2xSaI_ex8(u8 *srcPtr, DWORD srcPitch,\r
-                   u8  *dstBitmap, int width, int height)\r
+void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,\r
+                   unsigned char  *dstBitmap, int width, int height)\r
 {\r
  DWORD dstPitch = srcPitch * 2;\r
  DWORD line;\r
@@ -3548,15 +3529,15 @@ void DoTexGarbageCollection(void)
 /////////////////////////////////////////////////////////////////////////////\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
-u8 * CheckTextureInSubSCache(long TextureMode,unsigned long GivenClutId,unsigned short * pCache)\r
+unsigned char * CheckTextureInSubSCache(long TextureMode,unsigned long GivenClutId,unsigned short * pCache)\r
 {\r
  textureSubCacheEntryS * tsx, * tsb, *tsg;//, *tse=NULL;\r
  int i,iMax;EXLong npos;\r
- u8 cx,cy;\r
+ unsigned char cx,cy;\r
  int iC,j,k;unsigned long rx,ry,mx,my;\r
  EXLong * ul=0, * uls;\r
  EXLong rfree;\r
- u8 cXAdj,cYAdj;\r
+ unsigned char cXAdj,cYAdj;\r
 \r
  npos.l=*((unsigned long *)&gl_ux[4]);\r
 \r
@@ -3860,7 +3841,7 @@ BOOL GetCompressTexturePlace(textureSubCacheEntryS * tsx)
 {\r
  int i,j,k,iMax,iC;unsigned long rx,ry,mx,my;\r
  EXLong * ul=0, * uls, rfree;\r
- u8 cXAdj=1,cYAdj=1;\r
+ unsigned char cXAdj=1,cYAdj=1;\r
 \r
  rx=(int)tsx->pos.c[2]-(int)tsx->pos.c[3];\r
  ry=(int)tsx->pos.c[0]-(int)tsx->pos.c[1];\r
@@ -4128,11 +4109,11 @@ void CompressTextureSpace(void)
 \r
 GLuint SelectSubTextureS(long TextureMode, unsigned long GivenClutId) \r
 {\r
- u8 * OPtr;unsigned short iCache;short cx,cy;\r
+ unsigned char * OPtr;unsigned short iCache;short cx,cy;\r
 \r
  // sort sow/tow infos for fast access\r
 \r
- u8 ma1,ma2,mi1,mi2;\r
+ unsigned char ma1,ma2,mi1,mi2;\r
  if(gl_ux[0]>gl_ux[1]) {mi1=gl_ux[1];ma1=gl_ux[0];}\r
  else                  {mi1=gl_ux[0];ma1=gl_ux[1];}\r
  if(gl_ux[2]>gl_ux[3]) {mi2=gl_ux[3];ma2=gl_ux[2];}\r