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
cdrom: always error out on shell open
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpuExternals.h
diff --git
a/plugins/gpu-gles/gpuExternals.h
b/plugins/gpu-gles/gpuExternals.h
index
897b446
..
a6dbceb
100644
(file)
--- a/
plugins/gpu-gles/gpuExternals.h
+++ b/
plugins/gpu-gles/gpuExternals.h
@@
-41,6
+41,10
@@
extern "C" {
#include <GLES/glext.h>
\r
#endif
\r
\r
#include <GLES/glext.h>
\r
#endif
\r
\r
+#ifndef GL_BGRA_EXT
\r
+#define GL_BGRA_EXT GL_RGBA // ??
\r
+#endif
\r
+
\r
#ifdef __NANOGL__
\r
#define glTexParameteri(x,y,z) glTexParameterf(x,y,z)
\r
#define glAlphaFuncx(x,y) glAlphaFunc(x,y)
\r
#ifdef __NANOGL__
\r
#define glTexParameteri(x,y,z) glTexParameterf(x,y,z)
\r
#define glAlphaFuncx(x,y) glAlphaFunc(x,y)
\r
@@
-139,10
+143,10
@@
extern void ( APIENTRY * glPixelStorei )(GLenum pname, GLint param);
#define bool unsigned short
\r
#endif
\r
#define LOWORD(l) ((unsigned short)(l))
\r
#define bool unsigned short
\r
#endif
\r
#define LOWORD(l) ((unsigned short)(l))
\r
-#define HIWORD(l) ((unsigned short)(((unsigned
long
)(l) >> 16) & 0xFFFF))
\r
+#define HIWORD(l) ((unsigned short)(((unsigned
int
)(l) >> 16) & 0xFFFF))
\r
#define max(a,b) (((a) > (b)) ? (a) : (b))
\r
#define min(a,b) (((a) < (b)) ? (a) : (b))
\r
#define max(a,b) (((a) > (b)) ? (a) : (b))
\r
#define min(a,b) (((a) < (b)) ? (a) : (b))
\r
-#define DWORD unsigned
long
\r
+#define DWORD unsigned
int
\r
\r
typedef struct RECTTAG
\r
{
\r
\r
typedef struct RECTTAG
\r
{
\r
@@
-169,8
+173,8
@@
typedef struct VRAMLOADTAG
\r
typedef struct PSXPOINTTAG
\r
{
\r
\r
typedef struct PSXPOINTTAG
\r
{
\r
-
long
x;
\r
-
long
y;
\r
+
int
x;
\r
+
int
y;
\r
} PSXPoint_t;
\r
\r
typedef struct PSXSPOINTTAG
\r
} PSXPoint_t;
\r
\r
typedef struct PSXSPOINTTAG
\r
@@
-207,19
+211,19
@@
typedef struct PSXDISPLAYTAG
PSXPoint_t DisplayPosition;
\r
PSXPoint_t DisplayEnd;
\r
\r
PSXPoint_t DisplayPosition;
\r
PSXPoint_t DisplayEnd;
\r
\r
-
long
Double;
\r
-
long
Height;
\r
-
long
PAL;
\r
-
long
InterlacedNew;
\r
-
long
Interlaced;
\r
-
long
InterlacedTest;
\r
-
long
RGB24New;
\r
-
long
RGB24;
\r
+
int
Double;
\r
+
int
Height;
\r
+
int
PAL;
\r
+
int
InterlacedNew;
\r
+
int
Interlaced;
\r
+
int
InterlacedTest;
\r
+
int
RGB24New;
\r
+
int
RGB24;
\r
PSXSPoint_t DrawOffset;
\r
PSXRect_t DrawArea;
\r
PSXPoint_t GDrawOffset;
\r
PSXPoint_t CumulOffset;
\r
PSXSPoint_t DrawOffset;
\r
PSXRect_t DrawArea;
\r
PSXPoint_t GDrawOffset;
\r
PSXPoint_t CumulOffset;
\r
-
long
Disabled;
\r
+
int
Disabled;
\r
PSXRect_t Range;
\r
} PSXDisplay_t;
\r
\r
PSXRect_t Range;
\r
} PSXDisplay_t;
\r
\r
@@
-238,7
+242,7
@@
typedef struct OGLVertexTag
COLTAG
\r
{
\r
unsigned char col[4];
\r
COLTAG
\r
{
\r
unsigned char col[4];
\r
- unsigned
long
lcol;
\r
+ unsigned
int
lcol;
\r
} c;
\r
\r
} OGLVertex;
\r
} c;
\r
\r
} OGLVertex;
\r
@@
-252,7
+256,7
@@
typedef union EXShortTag
typedef union EXLongTag
\r
{
\r
unsigned char c[4];
\r
typedef union EXLongTag
\r
{
\r
unsigned char c[4];
\r
- unsigned
long
l;
\r
+ unsigned
int
l;
\r
EXShort s[2];
\r
} EXLong;
\r
\r
EXShort s[2];
\r
} EXLong;
\r
\r
@@
-284,7
+288,7
@@
extern unsigned char gl_vy[8];
extern OGLVertex vertex[4];
\r
extern short sprtY,sprtX,sprtH,sprtW;
\r
#ifdef _WINDOWS
\r
extern OGLVertex vertex[4];
\r
extern short sprtY,sprtX,sprtH,sprtW;
\r
#ifdef _WINDOWS
\r
-extern HWND hWWindow;
\r
+
//
extern HWND hWWindow;
\r
#endif
\r
extern BOOL bIsFirstFrame;
\r
extern int iWinSize;
\r
#endif
\r
extern BOOL bIsFirstFrame;
\r
extern int iWinSize;
\r
@@
-295,7
+299,7
@@
extern int iSetMask;
extern int iDepthFunc;
\r
extern BOOL bCheckMask;
\r
extern unsigned short sSetMask;
\r
extern int iDepthFunc;
\r
extern BOOL bCheckMask;
\r
extern unsigned short sSetMask;
\r
-extern unsigned
long
lSetMask;
\r
+extern unsigned
int
lSetMask;
\r
extern BOOL bSetClip;
\r
extern GLuint gTexScanName;
\r
\r
extern BOOL bSetClip;
\r
extern GLuint gTexScanName;
\r
\r
@@
-305,8
+309,8
@@
extern GLuint gTexScanName;
\r
#ifndef _IN_SOFT
\r
\r
\r
#ifndef _IN_SOFT
\r
\r
-extern
long
GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
\r
-extern
long
GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
\r
+extern
int
GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
\r
+extern
int
GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
\r
extern short ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3;
\r
extern short g_m1;
\r
extern short g_m2;
\r
extern short ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3;
\r
extern short g_m1;
\r
extern short g_m2;
\r
@@
-343,22
+347,22
@@
extern GLubyte ubGloAlpha;
extern short sSprite_ux2;
\r
extern short sSprite_vy2;
\r
extern BOOL bRenderFrontBuffer;
\r
extern short sSprite_ux2;
\r
extern short sSprite_vy2;
\r
extern BOOL bRenderFrontBuffer;
\r
-extern unsigned
long
ulOLDCOL;
\r
-extern unsigned
long
ulClutID;
\r
+extern unsigned
int
ulOLDCOL;
\r
+extern unsigned
int
ulClutID;
\r
extern void (*primTableJ[256])(unsigned char *);
\r
extern void (*primTableSkip[256])(unsigned char *);
\r
extern unsigned short usMirror;
\r
extern void (*primTableJ[256])(unsigned char *);
\r
extern void (*primTableSkip[256])(unsigned char *);
\r
extern unsigned short usMirror;
\r
-extern unsigned
long
dwCfgFixes;
\r
-extern unsigned
long
dwActFixes;
\r
-extern unsigned
long
dwEmuFixes;
\r
+extern unsigned
int
dwCfgFixes;
\r
+extern unsigned
int
dwActFixes;
\r
+extern unsigned
int
dwEmuFixes;
\r
extern BOOL bUseFixes;
\r
extern int iSpriteTex;
\r
extern int iDrawnSomething;
\r
\r
extern BOOL bUseFixes;
\r
extern int iSpriteTex;
\r
extern int iDrawnSomething;
\r
\r
-extern
long
drawX;
\r
-extern
long
drawY;
\r
-extern
long
drawW;
\r
-extern
long
drawH;
\r
+extern
int
drawX;
\r
+extern
int
drawY;
\r
+extern
int
drawW;
\r
+extern
int
drawH;
\r
extern short sxmin;
\r
extern short sxmax;
\r
extern short symin;
\r
extern short sxmin;
\r
extern short sxmax;
\r
extern short symin;
\r
@@
-379,10
+383,10
@@
extern GLint giWantedRGBA;
extern GLint giWantedFMT;
\r
extern GLint giWantedTYPE;
\r
extern void (*LoadSubTexFn) (int,int,short,short);
\r
extern GLint giWantedFMT;
\r
extern GLint giWantedTYPE;
\r
extern void (*LoadSubTexFn) (int,int,short,short);
\r
-extern
long
GlobalTexturePage;
\r
-extern unsigned
long (*TCF[]) (unsigned long
);
\r
+extern
int
GlobalTexturePage;
\r
+extern unsigned
int (*TCF[]) (unsigned int
);
\r
extern unsigned short (*PTCF[]) (unsigned short);
\r
extern unsigned short (*PTCF[]) (unsigned short);
\r
-extern unsigned
long (*PalTexturedColourFn) (unsigned long
);
\r
+extern unsigned
int (*PalTexturedColourFn) (unsigned int
);
\r
extern BOOL bUseFastMdec;
\r
extern BOOL bUse15bitMdec;
\r
extern int iFrameTexType;
\r
extern BOOL bUseFastMdec;
\r
extern BOOL bUse15bitMdec;
\r
extern int iFrameTexType;
\r
@@
-416,32
+420,32
@@
extern char szDispBuf[];
extern char szGPUKeys[];
\r
extern PSXDisplay_t PSXDisplay;
\r
extern PSXDisplay_t PreviousPSXDisplay;
\r
extern char szGPUKeys[];
\r
extern PSXDisplay_t PSXDisplay;
\r
extern PSXDisplay_t PreviousPSXDisplay;
\r
-//extern unsigned
long
ulKeybits;
\r
+//extern unsigned
int
ulKeybits;
\r
extern TWin_t TWin;
\r
extern BOOL bDisplayNotSet;
\r
extern TWin_t TWin;
\r
extern BOOL bDisplayNotSet;
\r
-extern
long
lGPUstatusRet;
\r
+extern
int
lGPUstatusRet;
\r
extern short imageX0,imageX1;
\r
extern short imageY0,imageY1;
\r
extern short imageX0,imageX1;
\r
extern short imageY0,imageY1;
\r
-extern
long
lClearOnSwap,lClearOnSwapColor;
\r
+extern
int
lClearOnSwap,lClearOnSwapColor;
\r
extern unsigned char * psxVub;
\r
extern char * psxVsb;
\r
extern unsigned short * psxVuw;
\r
extern signed short * psxVsw;
\r
extern unsigned char * psxVub;
\r
extern char * psxVsb;
\r
extern unsigned short * psxVuw;
\r
extern signed short * psxVsw;
\r
-extern unsigned
long
* psxVul;
\r
-extern signed
long
* psxVsl;
\r
+extern unsigned
int
* psxVul;
\r
+extern signed
int
* psxVsl;
\r
extern GLfloat gl_z;
\r
extern BOOL bNeedRGB24Update;
\r
extern BOOL bChangeWinMode;
\r
extern GLuint uiScanLine;
\r
extern int iUseScanLines;
\r
extern GLfloat gl_z;
\r
extern BOOL bNeedRGB24Update;
\r
extern BOOL bChangeWinMode;
\r
extern GLuint uiScanLine;
\r
extern int iUseScanLines;
\r
-extern
long
lSelectedSlot;
\r
+extern
int
lSelectedSlot;
\r
extern int iScanBlend;
\r
extern BOOL bInitCap;
\r
extern int iBlurBuffer;
\r
extern int iLastRGB24;
\r
extern int iRenderFVR;
\r
extern int iNoScreenSaver;
\r
extern int iScanBlend;
\r
extern BOOL bInitCap;
\r
extern int iBlurBuffer;
\r
extern int iLastRGB24;
\r
extern int iRenderFVR;
\r
extern int iNoScreenSaver;
\r
-extern unsigned
long
ulGPUInfoVals[];
\r
+extern unsigned
int
ulGPUInfoVals[];
\r
extern BOOL bNeedInterlaceUpdate;
\r
extern BOOL bNeedWriteUpload;
\r
extern BOOL bSkipNextFrame;
\r
extern BOOL bNeedInterlaceUpdate;
\r
extern BOOL bNeedWriteUpload;
\r
extern BOOL bSkipNextFrame;
\r
@@
-457,7
+461,7
@@
extern int bFullScreen;
\r
#ifndef _IN_MENU
\r
\r
\r
#ifndef _IN_MENU
\r
\r
-//extern unsigned
long
dwCoreFlags;
\r
+//extern unsigned
int
dwCoreFlags;
\r
extern GLuint gTexPicName;
\r
//extern PSXPoint_t ptCursorPoint[];
\r
//extern unsigned short usCursorActive;
\r
extern GLuint gTexPicName;
\r
//extern PSXPoint_t ptCursorPoint[];
\r
//extern unsigned short usCursorActive;
\r
@@
-535,7
+539,7
@@
typedef struct {
\r
#ifndef _IN_KEY
\r
\r
\r
#ifndef _IN_KEY
\r
\r
-//extern unsigned
long
ulKeybits;
\r
+//extern unsigned
int
ulKeybits;
\r
\r
#endif
\r
\r
\r
#endif
\r
\r
@@
-543,7
+547,7
@@
typedef struct {
\r
#ifndef _IN_ZN
\r
\r
\r
#ifndef _IN_ZN
\r
\r
-extern unsigned
long
dwGPUVersion;
\r
+extern unsigned
int
dwGPUVersion;
\r
extern int iGPUHeight;
\r
extern int iGPUHeightMask;
\r
extern int GlobalTextIL;
\r
extern int iGPUHeight;
\r
extern int iGPUHeightMask;
\r
extern int GlobalTextIL;
\r