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
[3DS] Set default CPU rate to the usual 57
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpuExternals.h
diff --git
a/plugins/gpu-gles/gpuExternals.h
b/plugins/gpu-gles/gpuExternals.h
index
f24c31a
..
1260167
100644
(file)
--- a/
plugins/gpu-gles/gpuExternals.h
+++ b/
plugins/gpu-gles/gpuExternals.h
@@
-32,26
+32,17
@@
#ifdef __cplusplus
\r
extern "C" {
\r
#endif
\r
#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 __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
#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
#endif
\r
\r
#ifdef __NANOGL__
\r
@@
-250,7
+241,7
@@
typedef struct OGLVertexTag
union
\r
COLTAG
\r
{
\r
union
\r
COLTAG
\r
{
\r
- u
8
col[4];
\r
+ u
nsigned char
col[4];
\r
unsigned long lcol;
\r
} c;
\r
\r
unsigned long lcol;
\r
} c;
\r
\r
@@
-258,13
+249,13
@@
COLTAG
\r
typedef union EXShortTag
\r
{
\r
\r
typedef union EXShortTag
\r
{
\r
- u
8
c[2];
\r
+ u
nsigned char
c[2];
\r
unsigned short s;
\r
} EXShort;
\r
\r
typedef union EXLongTag
\r
{
\r
unsigned short s;
\r
} EXShort;
\r
\r
typedef union EXLongTag
\r
{
\r
- u
8
c[4];
\r
+ u
nsigned char
c[4];
\r
unsigned long l;
\r
EXShort s[2];
\r
} EXLong;
\r
unsigned long l;
\r
EXShort s[2];
\r
} EXLong;
\r
@@
-292,8
+283,8
@@
extern BOOL bAdvancedBlend;
//extern PFNGLBLENDEQU glBlendEquationEXTEx;
\r
//extern PFNGLCOLORTABLEEXT glColorTableEXTEx;
\r
\r
//extern PFNGLBLENDEQU glBlendEquationEXTEx;
\r
//extern PFNGLCOLORTABLEEXT glColorTableEXTEx;
\r
\r
-extern u
8
gl_ux[8];
\r
-extern u
8
gl_vy[8];
\r
+extern u
nsigned char
gl_ux[8];
\r
+extern u
nsigned char
gl_vy[8];
\r
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
@@
-358,8
+349,8
@@
extern short sSprite_vy2;
extern BOOL bRenderFrontBuffer;
\r
extern unsigned long ulOLDCOL;
\r
extern unsigned long ulClutID;
\r
extern BOOL bRenderFrontBuffer;
\r
extern unsigned long ulOLDCOL;
\r
extern unsigned long ulClutID;
\r
-extern void (*primTableJ[256])(u
8
*);
\r
-extern void (*primTableSkip[256])(u
8
*);
\r
+extern void (*primTableJ[256])(u
nsigned char
*);
\r
+extern void (*primTableSkip[256])(u
nsigned char
*);
\r
extern unsigned short usMirror;
\r
extern unsigned long dwCfgFixes;
\r
extern unsigned long dwActFixes;
\r
extern unsigned short usMirror;
\r
extern unsigned long dwCfgFixes;
\r
extern unsigned long dwActFixes;
\r
@@
-377,13
+368,17
@@
extern short sxmax;
extern short symin;
\r
extern short symax;
\r
\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
#endif
\r
\r
//-----------------------------------------------------//
\r
\r
#ifndef _IN_TEXTURE
\r
\r
-extern u
8
ubOpaqueDraw;
\r
+extern u
nsigned char
ubOpaqueDraw;
\r
extern GLint giWantedRGBA;
\r
extern GLint giWantedFMT;
\r
extern GLint giWantedTYPE;
\r
extern GLint giWantedRGBA;
\r
extern GLint giWantedFMT;
\r
extern GLint giWantedTYPE;
\r
@@
-421,8
+416,8
@@
extern int iDataReadMode;
extern int iColDepth;
\r
extern BOOL bChangeRes;
\r
extern BOOL bWindowMode;
\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 PSXDisplay_t PSXDisplay;
\r
extern PSXDisplay_t PreviousPSXDisplay;
\r
//extern unsigned long ulKeybits;
\r
@@
-432,8
+427,8
@@
extern long lGPUstatusRet;
extern short imageX0,imageX1;
\r
extern short imageY0,imageY1;
\r
extern long lClearOnSwap,lClearOnSwapColor;
\r
extern short imageX0,imageX1;
\r
extern short imageY0,imageY1;
\r
extern long lClearOnSwap,lClearOnSwapColor;
\r
-extern u
8
* psxVub;
\r
-extern
s8
* psxVsb;
\r
+extern u
nsigned char
* psxVub;
\r
+extern
char
* psxVsb;
\r
extern unsigned short * psxVuw;
\r
extern signed short * psxVsw;
\r
extern unsigned long * psxVul;
\r
extern unsigned short * psxVuw;
\r
extern signed short * psxVsw;
\r
extern unsigned long * psxVul;
\r
@@
-478,7
+473,7
@@
extern GLuint gTexPicName;
#ifndef _IN_CFG
\r
\r
#ifndef _WINDOWS
\r
#ifndef _IN_CFG
\r
\r
#ifndef _WINDOWS
\r
-extern
s8
* pConfigFile;
\r
+extern
char
* pConfigFile;
\r
#endif
\r
\r
#endif
\r
#endif
\r
\r
#endif
\r
@@
-500,10
+495,10
@@
extern float fps_cur;
//-----------------------------------------------------//
\r
\r
typedef struct {
\r
//-----------------------------------------------------//
\r
\r
typedef struct {
\r
-u
8
r;
\r
-u
8
g;
\r
-u
8
b;
\r
-u
8
a;
\r
+u
nsigned char
r;
\r
+u
nsigned char
g;
\r
+u
nsigned char
b;
\r
+u
nsigned char
a;
\r
} Vec4f;
\r
\r
/**/
\r
} Vec4f;
\r
\r
/**/
\r
@@
-529,7
+524,7
@@
typedef struct {
int x;
\r
int y;
\r
} Vec2f;
\r
int x;
\r
int y;
\r
} Vec2f;
\r
-
/*
*/
\r
+*/
\r
\r
typedef struct {
\r
Vec3f xyz;
\r
\r
typedef struct {
\r
Vec3f xyz;
\r