notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpu-gles: schtruck/fpse merge: don't delay gl init
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpuTexture.c
diff --git
a/plugins/gpu-gles/gpuTexture.c
b/plugins/gpu-gles/gpuTexture.c
index
d047a62
..
c3d88f9
100644
(file)
--- a/
plugins/gpu-gles/gpuTexture.c
+++ b/
plugins/gpu-gles/gpuTexture.c
@@
-67,42
+67,15
@@
\r
#define _IN_TEXTURE
\r
\r
\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
#include "gpuStdafx.h"
\r
-#ifdef __NANOGL__
\r
-#include <gl/gl.h>
\r
-#include <gl/gl.h>
\r
-#else
\r
-#ifdef SOFT_LINKAGE
\r
-#pragma softfp_linkage
\r
-#endif
\r
-#ifdef MAEMO_CHANGES
\r
- #include <GLES/glplatform.h>
\r
- #include <GLES/gl.h>
\r
- #include <GLES/glext.h>
\r
- #include <EGL/egl.h>
\r
-#else
\r
- #include <gles/gl.h> // for opengl es types
\r
- #include <gles/egltypes.h>
\r
-#endif
\r
-#ifdef SOFT_LINKAGE
\r
-#pragma no_softfp_linkage
\r
-#endif
\r
-#endif
\r
+
\r
#include "gpuDraw.h"
\r
//#include "plugins.h"
\r
#include "gpuExternals.h"
\r
#include "gpuTexture.h"
\r
#include "gpuPlugin.h"
\r
#include "gpuPrim.h"
\r
#include "gpuDraw.h"
\r
//#include "plugins.h"
\r
#include "gpuExternals.h"
\r
#include "gpuTexture.h"
\r
#include "gpuPlugin.h"
\r
#include "gpuPrim.h"
\r
-#endif
\r
+
\r
#define CLUTCHK 0x00060000
\r
#define CLUTSHIFT 17
\r
\r
#define CLUTCHK 0x00060000
\r
#define CLUTSHIFT 17
\r
\r
@@
-117,11
+90,7
@@
GLuint gTexFrameName=0;
int iTexGarbageCollection=1;
\r
unsigned long dwTexPageComp=0;
\r
int iVRamSize=0;
\r
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
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
int iFilter = GL_LINEAR;
\r
void (*LoadSubTexFn) (int,int,short,short);
\r
unsigned long (*PalTexturedColourFn) (unsigned long);
\r
@@
-158,7
+127,7
@@
unsigned long (*PalTexturedColourFn) (unsigned long);
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-u
8
* CheckTextureInSubSCache(long TextureMode,unsigned long GivenClutId,unsigned short * pCache);
\r
+u
nsigned 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
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
@@
-185,10
+154,6
@@
unsigned short (*PTCF[2]) (unsigned short);
// texture cache implementation
\r
////////////////////////////////////////////////////////////////////////
\r
\r
// 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
// "texture window" cache entry
\r
\r
typedef struct textureWndCacheEntryTag
\r
@@
-208,15
+173,12
@@
typedef struct textureSubCacheEntryTagS
{
\r
unsigned long ClutID;
\r
EXLong pos;
\r
{
\r
unsigned long ClutID;
\r
EXLong pos;
\r
- u
8
posTX;
\r
- u
8
posTY;
\r
- u
8
cTexID;
\r
- u
8
Opaque;
\r
+ u
nsigned char
posTX;
\r
+ u
nsigned char
posTY;
\r
+ u
nsigned char
cTexID;
\r
+ u
nsigned char
Opaque;
\r
} textureSubCacheEntryS;
\r
\r
} textureSubCacheEntryS;
\r
\r
-#ifdef _WINDOWS
\r
-#pragma pack()
\r
-#endif
\r
\r
//---------------------------------------------
\r
\r
\r
//---------------------------------------------
\r
\r
@@
-239,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
GLubyte * texturepart=NULL;
\r
GLubyte * texturebuffer=NULL;
\r
unsigned long g_x1,g_y1,g_x2,g_y2;
\r
-u
8
ubOpaqueDraw=0;
\r
+u
nsigned char
ubOpaqueDraw=0;
\r
\r
unsigned short MAXTPAGES = 32;
\r
unsigned short CLUTMASK = 0x7fff;
\r
\r
unsigned short MAXTPAGES = 32;
\r
unsigned short CLUTMASK = 0x7fff;
\r
@@
-481,7
+443,7
@@
void CheckTextureMemory(void)
{
\r
GLboolean b;GLboolean * bDetail;
\r
int i,iCnt,iRam=iVRamSize*1024*1024;
\r
{
\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
\r
\r
if(iVRamSize)
\r
@@
-512,7
+474,7
@@
void CheckTextureMemory(void)
\r
\r
iTSize=256;
\r
\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
\r
iCnt=0;
\r
glGenTextures(MAXSORTTEX,uiStexturePage);
\r
@@
-771,7
+733,7
@@
void InvalidateWndTextureArea(long X,long Y,long W, long H)
void MarkFree(textureSubCacheEntryS * tsx)
\r
{
\r
EXLong * ul, * uls;
\r
void MarkFree(textureSubCacheEntryS * tsx)
\r
{
\r
EXLong * ul, * uls;
\r
- int j,iMax;u
8
x1,y1,dx,dy;
\r
+ int j,iMax;u
nsigned char
x1,y1,dx,dy;
\r
\r
uls=pxSsubtexLeft[tsx->cTexID];
\r
iMax=uls->l;ul=uls+1;
\r
\r
uls=pxSsubtexLeft[tsx->cTexID];
\r
iMax=uls->l;ul=uls+1;
\r
@@
-945,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
unsigned long start,row,column,j,sxh,sxm,ldx,ldy,ldxo;
\r
unsigned int palstart;
\r
unsigned short *px,*pa,*ta;
\r
- u
8
*cSRCPtr,*cOSRCPtr;
\r
+ u
nsigned char
*cSRCPtr,*cOSRCPtr;
\r
unsigned short *wSRCPtr,*wOSRCPtr;
\r
unsigned long LineOffset;unsigned short s;
\r
int pmult=pageid/16;
\r
unsigned short *wSRCPtr,*wOSRCPtr;
\r
unsigned long LineOffset;unsigned short s;
\r
int pmult=pageid/16;
\r
@@
-1137,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
unsigned long start,row,column,j,sxh,sxm,ldx,ldy,ldxo,s;
\r
unsigned int palstart;
\r
unsigned long *px,*pa,*ta;
\r
- u
8
*cSRCPtr,*cOSRCPtr;
\r
+ u
nsigned char
*cSRCPtr,*cOSRCPtr;
\r
unsigned short *wSRCPtr,*wOSRCPtr;
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
unsigned short *wSRCPtr,*wOSRCPtr;
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
@@
-1348,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
unsigned long start,row,column,j,sxh,sxm;
\r
unsigned int palstart;
\r
unsigned short *px,*pa,*ta;
\r
- u
8
*cSRCPtr;
\r
+ u
nsigned char
*cSRCPtr;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
@@
-1490,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
unsigned long start,row,column,j,sxh,sxm;
\r
unsigned int palstart;
\r
unsigned long *px,*pa,*ta;
\r
- u
8
*cSRCPtr;
\r
+ u
nsigned char
*cSRCPtr;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
@@
-1698,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
void LoadPalWndTexturePage(int pageid, int mode, short cx, short cy)
\r
{
\r
unsigned long start,row,column,j,sxh,sxm;
\r
- u
8
*ta;
\r
- u
8
*cSRCPtr;
\r
+ u
nsigned char
*ta;
\r
+ u
nsigned char
*cSRCPtr;
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
\r
unsigned long LineOffset;
\r
int pmult=pageid/16;
\r
\r
- ta=(u
8
*)texturepart;
\r
+ ta=(u
nsigned char
*)texturepart;
\r
\r
switch(mode)
\r
{
\r
\r
switch(mode)
\r
{
\r
@@
-1758,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
void LoadStretchPalWndTexturePage(int pageid, int mode, short cx, short cy)
\r
{
\r
unsigned long start,row,column,j,sxh,sxm,ldx,ldy,ldxo;
\r
- u
8
*ta,s;
\r
- u
8
*cSRCPtr,*cOSRCPtr;
\r
+ u
nsigned char
*ta,s;
\r
+ u
nsigned 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
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=(u
8
*)texturepart;
\r
+ ta=(u
nsigned char
*)texturepart;
\r
\r
switch(mode)
\r
{
\r
\r
switch(mode)
\r
{
\r
@@
-2025,7
+1987,7
@@
void DefineTextureMovie(void)
// movie texture: load
\r
////////////////////////////////////////////////////////////////////////
\r
\r
// movie texture: load
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-u
8
* LoadDirectMovieFast(void)
\r
+u
nsigned char
* LoadDirectMovieFast(void)
\r
{
\r
long row,column;
\r
unsigned int startxy;
\r
{
\r
long row,column;
\r
unsigned int startxy;
\r
@@
-2034,13
+1996,13
@@
u8 * LoadDirectMovieFast(void)
\r
if(PSXDisplay.RGB24)
\r
{
\r
\r
if(PSXDisplay.RGB24)
\r
{
\r
- u
8
* pD;
\r
+ u
nsigned char
* pD;
\r
\r
startxy=((1024)*xrMovieArea.y0)+xrMovieArea.x0;
\r
\r
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++,startxy+=1024)
\r
{
\r
\r
startxy=((1024)*xrMovieArea.y0)+xrMovieArea.x0;
\r
\r
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++,startxy+=1024)
\r
{
\r
- pD=(u
8
*)&psxVuw[startxy];
\r
+ pD=(u
nsigned char
*)&psxVuw[startxy];
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
@@
-2077,7
+2039,7
@@
GLuint LoadTextureMovieFast(void)
{
\r
if(PSXDisplay.RGB24)
\r
{
\r
{
\r
if(PSXDisplay.RGB24)
\r
{
\r
- u
8
* pD;
\r
+ u
nsigned char
* pD;
\r
unsigned long * ta=(unsigned long *)texturepart;
\r
\r
startxy=((1024)*xrMovieArea.y0)+xrMovieArea.x0;
\r
unsigned long * ta=(unsigned long *)texturepart;
\r
\r
startxy=((1024)*xrMovieArea.y0)+xrMovieArea.x0;
\r
@@
-2085,7
+2047,7
@@
GLuint LoadTextureMovieFast(void)
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++,startxy+=1024)
\r
{
\r
//startxy=((1024)*column)+xrMovieArea.x0;
\r
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++,startxy+=1024)
\r
{
\r
//startxy=((1024)*column)+xrMovieArea.x0;
\r
- pD=(u
8
*)&psxVuw[startxy];
\r
+ pD=(u
nsigned char
*)&psxVuw[startxy];
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
@@
-2133,7
+2095,7
@@
GLuint LoadTextureMovie(void)
{
\r
if(PSXDisplay.RGB24)
\r
{
\r
{
\r
if(PSXDisplay.RGB24)
\r
{
\r
- u
8
* pD;
\r
+ u
nsigned char
* pD;
\r
unsigned long * ta=(unsigned long *)texturepart;
\r
\r
if(b_X)
\r
unsigned long * ta=(unsigned long *)texturepart;
\r
\r
if(b_X)
\r
@@
-2141,7
+2103,7
@@
GLuint LoadTextureMovie(void)
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++)
\r
{
\r
startxy=((1024)*column)+xrMovieArea.x0;
\r
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++)
\r
{
\r
startxy=((1024)*column)+xrMovieArea.x0;
\r
- pD=(u
8
*)&psxVuw[startxy];
\r
+ pD=(u
nsigned char
*)&psxVuw[startxy];
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
@@
-2162,7
+2124,7
@@
GLuint LoadTextureMovie(void)
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++)
\r
{
\r
startxy=((1024)*column)+xrMovieArea.x0;
\r
for(column=xrMovieArea.y0;column<xrMovieArea.y1;column++)
\r
{
\r
startxy=((1024)*column)+xrMovieArea.x0;
\r
- pD=(u
8
*)&psxVuw[startxy];
\r
+ pD=(u
nsigned char
*)&psxVuw[startxy];
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
\r
{
\r
*ta++=*((unsigned long *)pD)|0xff000000;
\r
@@
-2346,7
+2308,7
@@
GLuint Fake15BitTexture(void)
\r
if(!gTexFrameName)
\r
{
\r
\r
if(!gTexFrameName)
\r
{
\r
-
s8
* p;
\r
+
char
* p;
\r
\r
if(iResX>1280 || iResY>1024) iFTex=2048;
\r
else
\r
\r
if(iResX>1280 || iResY>1024) iFTex=2048;
\r
else
\r
@@
-2362,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
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
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
@@
-2450,7
+2412,7
@@
GLuint Fake15BitTexture(void)
\r
if(glGetError())
\r
{
\r
\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
memset(p,0,iFTex*iFTex*4);
\r
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, iFTex, iFTex,
\r
GL_RGBA, GL_UNSIGNED_BYTE, p);
\r
@@
-2484,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
unsigned long start,row,column,j,sxh,sxm;
\r
unsigned int palstart;
\r
unsigned long *px,*pa,*ta;
\r
- u
8
*cSRCPtr;
\r
+ u
nsigned char
*cSRCPtr;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
unsigned long x2a,xalign=0;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
unsigned long x2a,xalign=0;
\r
@@
-2812,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
unsigned long start,row,column,j,sxh,sxm;
\r
unsigned int palstart;
\r
unsigned short *px,*pa,*ta;
\r
- u
8
*cSRCPtr;
\r
+ u
nsigned char
*cSRCPtr;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
unsigned long x2a,xalign=0;
\r
unsigned short *wSRCPtr;
\r
unsigned long LineOffset;
\r
unsigned long x2a,xalign=0;
\r
@@
-3128,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
\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(u
8
*srcPtr, DWORD srcPitch,
\r
- u
8
*dstBitmap, int width, int height)
\r
+void Super2xSaI_ex8_Ex(u
nsigned char
*srcPtr, DWORD srcPitch,
\r
+ u
nsigned char
*dstBitmap, int width, int height)
\r
{
\r
DWORD dstPitch = srcPitch * 2;
\r
DWORD line;
\r
{
\r
DWORD dstPitch = srcPitch * 2;
\r
DWORD line;
\r
@@
-3273,8
+3235,8
@@
void Super2xSaI_ex8_Ex(u8 *srcPtr, DWORD srcPitch,
}
\r
\r
\r
}
\r
\r
\r
-void Super2xSaI_ex8(u
8
*srcPtr, DWORD srcPitch,
\r
- u
8
*dstBitmap, int width, int height)
\r
+void Super2xSaI_ex8(u
nsigned char
*srcPtr, DWORD srcPitch,
\r
+ u
nsigned char
*dstBitmap, int width, int height)
\r
{
\r
DWORD dstPitch = srcPitch * 2;
\r
DWORD line;
\r
{
\r
DWORD dstPitch = srcPitch * 2;
\r
DWORD line;
\r
@@
-3567,15
+3529,15
@@
void DoTexGarbageCollection(void)
/////////////////////////////////////////////////////////////////////////////
\r
/////////////////////////////////////////////////////////////////////////////
\r
\r
/////////////////////////////////////////////////////////////////////////////
\r
/////////////////////////////////////////////////////////////////////////////
\r
\r
-u
8
* CheckTextureInSubSCache(long TextureMode,unsigned long GivenClutId,unsigned short * pCache)
\r
+u
nsigned 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
{
\r
textureSubCacheEntryS * tsx, * tsb, *tsg;//, *tse=NULL;
\r
int i,iMax;EXLong npos;
\r
- u
8
cx,cy;
\r
+ u
nsigned char
cx,cy;
\r
int iC,j,k;unsigned long rx,ry,mx,my;
\r
EXLong * ul=0, * uls;
\r
EXLong rfree;
\r
int iC,j,k;unsigned long rx,ry,mx,my;
\r
EXLong * ul=0, * uls;
\r
EXLong rfree;
\r
- u
8
cXAdj,cYAdj;
\r
+ u
nsigned char
cXAdj,cYAdj;
\r
\r
npos.l=*((unsigned long *)&gl_ux[4]);
\r
\r
\r
npos.l=*((unsigned long *)&gl_ux[4]);
\r
\r
@@
-3879,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
{
\r
int i,j,k,iMax,iC;unsigned long rx,ry,mx,my;
\r
EXLong * ul=0, * uls, rfree;
\r
- u
8
cXAdj=1,cYAdj=1;
\r
+ u
nsigned 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
\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
@@
-4147,11
+4109,11
@@
void CompressTextureSpace(void)
\r
GLuint SelectSubTextureS(long TextureMode, unsigned long GivenClutId)
\r
{
\r
\r
GLuint SelectSubTextureS(long TextureMode, unsigned long GivenClutId)
\r
{
\r
- u
8
* OPtr;unsigned short iCache;short cx,cy;
\r
+ u
nsigned char
* OPtr;unsigned short iCache;short cx,cy;
\r
\r
// sort sow/tow infos for fast access
\r
\r
\r
// sort sow/tow infos for fast access
\r
\r
- u
8
ma1,ma2,mi1,mi2;
\r
+ u
nsigned 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
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