#ifdef __cplusplus\r
extern "C" {\r
#endif\r
-#define _GPU_API_\r
-#ifndef _WINDOWS\r
+\r
#ifdef __NANOGL__\r
#include <gl/gl.h>\r
#include <gl/egl.h>\r
#else\r
-#ifdef SOFT_LINKAGE\r
-#pragma softfp_linkage\r
-#endif\r
-#include <gles/gl.h> // for opengl es types \r
-#ifdef SOFT_LINKAGE\r
-#pragma no_softfp_linkage\r
-#endif\r
-#endif\r
+#include <GLES/gl.h>\r
+#include <GLES/glext.h>\r
#endif\r
\r
-#ifdef MAEMO_CHANGES\r
- #include "../psxCommon.h"\r
-#else\r
- #include "psxCommon.h"\r
+#ifndef GL_BGRA_EXT\r
+#define GL_BGRA_EXT GL_RGBA // ??\r
#endif\r
\r
#ifdef __NANOGL__\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 DWORD unsigned long\r
+#define DWORD unsigned int\r
\r
typedef struct RECTTAG\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 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
- long Disabled;\r
+ int Disabled;\r
PSXRect_t Range;\r
} PSXDisplay_t;\r
\r
union\r
COLTAG\r
{\r
- u8 col[4];\r
- unsigned long lcol;\r
+ unsigned char col[4];\r
+ unsigned int lcol;\r
} c;\r
\r
} OGLVertex;\r
\r
typedef union EXShortTag\r
{\r
- u8 c[2];\r
+ unsigned char c[2];\r
unsigned short s;\r
} EXShort;\r
\r
typedef union EXLongTag\r
{\r
- u8 c[4];\r
- unsigned long l;\r
+ unsigned char c[4];\r
+ unsigned int l;\r
EXShort s[2];\r
} EXLong;\r
\r
//extern PFNGLBLENDEQU glBlendEquationEXTEx;\r
//extern PFNGLCOLORTABLEEXT glColorTableEXTEx;\r
\r
-extern u8 gl_ux[8];\r
-extern u8 gl_vy[8];\r
+extern unsigned char gl_ux[8];\r
+extern unsigned char gl_vy[8];\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
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
\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 sSprite_ux2;\r
extern short sSprite_vy2;\r
extern BOOL bRenderFrontBuffer;\r
-extern unsigned long ulOLDCOL;\r
-extern unsigned long ulClutID;\r
-extern void (*primTableJ[256])(u8 *);\r
-extern void (*primTableSkip[256])(u8 *);\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 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 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 symax;\r
\r
+extern unsigned int CSVERTEX;\r
+extern unsigned int CSCOLOR;\r
+extern unsigned int CSTEXTURE;\r
+\r
#endif\r
\r
//-----------------------------------------------------//\r
\r
#ifndef _IN_TEXTURE\r
\r
-extern u8 ubOpaqueDraw;\r
+extern unsigned char ubOpaqueDraw;\r
extern GLint giWantedRGBA;\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 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 int iColDepth;\r
extern BOOL bChangeRes;\r
extern BOOL bWindowMode;\r
-extern s8 szDispBuf[];\r
-extern s8 szGPUKeys[];\r
+extern char szDispBuf[];\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 long lGPUstatusRet;\r
+extern int lGPUstatusRet;\r
extern short imageX0,imageX1;\r
extern short imageY0,imageY1;\r
-extern long lClearOnSwap,lClearOnSwapColor;\r
-extern u8 * psxVub;\r
-extern s8 * psxVsb;\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 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 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 unsigned long ulGPUInfoVals[];\r
+extern unsigned int ulGPUInfoVals[];\r
extern BOOL bNeedInterlaceUpdate;\r
extern BOOL bNeedWriteUpload;\r
extern BOOL bSkipNextFrame;\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
#ifndef _IN_CFG\r
\r
#ifndef _WINDOWS\r
-extern s8 * pConfigFile;\r
+extern char * pConfigFile;\r
#endif\r
\r
#endif\r
//-----------------------------------------------------//\r
\r
typedef struct {\r
-u8 r;\r
-u8 g;\r
-u8 b;\r
-u8 a;\r
+unsigned char r;\r
+unsigned char g;\r
+unsigned char b;\r
+unsigned char a;\r
} Vec4f;\r
\r
/**/\r
int x;\r
int y;\r
} Vec2f;\r
-/**/\r
+*/\r
\r
typedef struct {\r
Vec3f xyz;\r
\r
#ifndef _IN_KEY\r
\r
-//extern unsigned long ulKeybits;\r
+//extern unsigned int ulKeybits;\r
\r
#endif\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