X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu-gles%2FgpuExternals.h;h=0a8acf594af44edfb9a4c7646e3815fc8a11dfef;hp=f24c31ad1e6fba349adbc223a13d4cf2daebf114;hb=HEAD;hpb=ce879073e4f228deec8bec5db8a2ff640636c88f diff --git a/plugins/gpu-gles/gpuExternals.h b/plugins/gpu-gles/gpuExternals.h index f24c31ad..a6dbceb2 100644 --- a/plugins/gpu-gles/gpuExternals.h +++ b/plugins/gpu-gles/gpuExternals.h @@ -32,26 +32,17 @@ #ifdef __cplusplus extern "C" { #endif -#define _GPU_API_ -#ifndef _WINDOWS + #ifdef __NANOGL__ #include #include #else -#ifdef SOFT_LINKAGE -#pragma softfp_linkage -#endif -#include // for opengl es types -#ifdef SOFT_LINKAGE -#pragma no_softfp_linkage -#endif -#endif +#include +#include #endif -#ifdef MAEMO_CHANGES - #include "../psxCommon.h" -#else - #include "psxCommon.h" +#ifndef GL_BGRA_EXT +#define GL_BGRA_EXT GL_RGBA // ?? #endif #ifdef __NANOGL__ @@ -152,10 +143,10 @@ extern void ( APIENTRY * glPixelStorei )(GLenum pname, GLint param); #define bool unsigned short #endif #define LOWORD(l) ((unsigned short)(l)) -#define HIWORD(l) ((unsigned short)(((unsigned long)(l) >> 16) & 0xFFFF)) +#define HIWORD(l) ((unsigned short)(((unsigned int)(l) >> 16) & 0xFFFF)) #define max(a,b) (((a) > (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b)) -#define DWORD unsigned long +#define DWORD unsigned int typedef struct RECTTAG { @@ -182,8 +173,8 @@ typedef struct VRAMLOADTAG typedef struct PSXPOINTTAG { - long x; - long y; + int x; + int y; } PSXPoint_t; typedef struct PSXSPOINTTAG @@ -220,19 +211,19 @@ typedef struct PSXDISPLAYTAG PSXPoint_t DisplayPosition; PSXPoint_t DisplayEnd; - long Double; - long Height; - long PAL; - long InterlacedNew; - long Interlaced; - long InterlacedTest; - long RGB24New; - long RGB24; + int Double; + int Height; + int PAL; + int InterlacedNew; + int Interlaced; + int InterlacedTest; + int RGB24New; + int RGB24; PSXSPoint_t DrawOffset; PSXRect_t DrawArea; PSXPoint_t GDrawOffset; PSXPoint_t CumulOffset; - long Disabled; + int Disabled; PSXRect_t Range; } PSXDisplay_t; @@ -250,22 +241,22 @@ typedef struct OGLVertexTag union COLTAG { - u8 col[4]; - unsigned long lcol; + unsigned char col[4]; + unsigned int lcol; } c; } OGLVertex; typedef union EXShortTag { - u8 c[2]; + unsigned char c[2]; unsigned short s; } EXShort; typedef union EXLongTag { - u8 c[4]; - unsigned long l; + unsigned char c[4]; + unsigned int l; EXShort s[2]; } EXLong; @@ -292,12 +283,12 @@ extern BOOL bAdvancedBlend; //extern PFNGLBLENDEQU glBlendEquationEXTEx; //extern PFNGLCOLORTABLEEXT glColorTableEXTEx; -extern u8 gl_ux[8]; -extern u8 gl_vy[8]; +extern unsigned char gl_ux[8]; +extern unsigned char gl_vy[8]; extern OGLVertex vertex[4]; extern short sprtY,sprtX,sprtH,sprtW; #ifdef _WINDOWS -extern HWND hWWindow; +//extern HWND hWWindow; #endif extern BOOL bIsFirstFrame; extern int iWinSize; @@ -308,7 +299,7 @@ extern int iSetMask; extern int iDepthFunc; extern BOOL bCheckMask; extern unsigned short sSetMask; -extern unsigned long lSetMask; +extern unsigned int lSetMask; extern BOOL bSetClip; extern GLuint gTexScanName; @@ -318,8 +309,8 @@ extern GLuint gTexScanName; #ifndef _IN_SOFT -extern long GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP; -extern long GlobalTextREST,GlobalTextABR,GlobalTextPAGE; +extern int GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP; +extern int GlobalTextREST,GlobalTextABR,GlobalTextPAGE; extern short ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3; extern short g_m1; extern short g_m2; @@ -356,42 +347,46 @@ extern GLubyte ubGloAlpha; extern short sSprite_ux2; extern short sSprite_vy2; extern BOOL bRenderFrontBuffer; -extern unsigned long ulOLDCOL; -extern unsigned long ulClutID; -extern void (*primTableJ[256])(u8 *); -extern void (*primTableSkip[256])(u8 *); +extern unsigned int ulOLDCOL; +extern unsigned int ulClutID; +extern void (*primTableJ[256])(unsigned char *); +extern void (*primTableSkip[256])(unsigned char *); extern unsigned short usMirror; -extern unsigned long dwCfgFixes; -extern unsigned long dwActFixes; -extern unsigned long dwEmuFixes; +extern unsigned int dwCfgFixes; +extern unsigned int dwActFixes; +extern unsigned int dwEmuFixes; extern BOOL bUseFixes; extern int iSpriteTex; extern int iDrawnSomething; -extern long drawX; -extern long drawY; -extern long drawW; -extern long drawH; +extern int drawX; +extern int drawY; +extern int drawW; +extern int drawH; extern short sxmin; extern short sxmax; extern short symin; extern short symax; +extern unsigned int CSVERTEX; +extern unsigned int CSCOLOR; +extern unsigned int CSTEXTURE; + #endif //-----------------------------------------------------// #ifndef _IN_TEXTURE -extern u8 ubOpaqueDraw; +extern unsigned char ubOpaqueDraw; extern GLint giWantedRGBA; extern GLint giWantedFMT; extern GLint giWantedTYPE; extern void (*LoadSubTexFn) (int,int,short,short); -extern long GlobalTexturePage; -extern unsigned long (*TCF[]) (unsigned long); +extern int GlobalTexturePage; +extern unsigned int (*TCF[]) (unsigned int ); extern unsigned short (*PTCF[]) (unsigned short); -extern unsigned long (*PalTexturedColourFn) (unsigned long); +extern unsigned int (*PalTexturedColourFn) (unsigned int); extern BOOL bUseFastMdec; extern BOOL bUse15bitMdec; extern int iFrameTexType; @@ -421,36 +416,36 @@ extern int iDataReadMode; extern int iColDepth; extern BOOL bChangeRes; extern BOOL bWindowMode; -extern s8 szDispBuf[]; -extern s8 szGPUKeys[]; +extern char szDispBuf[]; +extern char szGPUKeys[]; extern PSXDisplay_t PSXDisplay; extern PSXDisplay_t PreviousPSXDisplay; -//extern unsigned long ulKeybits; +//extern unsigned int ulKeybits; extern TWin_t TWin; extern BOOL bDisplayNotSet; -extern long lGPUstatusRet; +extern int lGPUstatusRet; extern short imageX0,imageX1; extern short imageY0,imageY1; -extern long lClearOnSwap,lClearOnSwapColor; -extern u8 * psxVub; -extern s8 * psxVsb; +extern int lClearOnSwap,lClearOnSwapColor; +extern unsigned char * psxVub; +extern char * psxVsb; extern unsigned short * psxVuw; extern signed short * psxVsw; -extern unsigned long * psxVul; -extern signed long * psxVsl; +extern unsigned int * psxVul; +extern signed int * psxVsl; extern GLfloat gl_z; extern BOOL bNeedRGB24Update; extern BOOL bChangeWinMode; extern GLuint uiScanLine; extern int iUseScanLines; -extern long lSelectedSlot; +extern int lSelectedSlot; extern int iScanBlend; extern BOOL bInitCap; extern int iBlurBuffer; extern int iLastRGB24; extern int iRenderFVR; extern int iNoScreenSaver; -extern unsigned long ulGPUInfoVals[]; +extern unsigned int ulGPUInfoVals[]; extern BOOL bNeedInterlaceUpdate; extern BOOL bNeedWriteUpload; extern BOOL bSkipNextFrame; @@ -466,7 +461,7 @@ extern int bFullScreen; #ifndef _IN_MENU -//extern unsigned long dwCoreFlags; +//extern unsigned int dwCoreFlags; extern GLuint gTexPicName; //extern PSXPoint_t ptCursorPoint[]; //extern unsigned short usCursorActive; @@ -478,7 +473,7 @@ extern GLuint gTexPicName; #ifndef _IN_CFG #ifndef _WINDOWS -extern s8 * pConfigFile; +extern char * pConfigFile; #endif #endif @@ -500,10 +495,10 @@ extern float fps_cur; //-----------------------------------------------------// typedef struct { -u8 r; -u8 g; -u8 b; -u8 a; +unsigned char r; +unsigned char g; +unsigned char b; +unsigned char a; } Vec4f; /**/ @@ -529,7 +524,7 @@ typedef struct { int x; int y; } Vec2f; -/**/ +*/ typedef struct { Vec3f xyz; @@ -544,7 +539,7 @@ typedef struct { #ifndef _IN_KEY -//extern unsigned long ulKeybits; +//extern unsigned int ulKeybits; #endif @@ -552,7 +547,7 @@ typedef struct { #ifndef _IN_ZN -extern unsigned long dwGPUVersion; +extern unsigned int dwGPUVersion; extern int iGPUHeight; extern int iGPUHeightMask; extern int GlobalTextIL;