X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu-gles%2FgpuPlugin.h;h=768ebe1f22493f9c9a96a0b771ba72f22cdd5ad3;hp=f5e918232dc633eae28150cbb82186ff892f412c;hb=9f58cabba9806e2c365c64f7a3701efa6282aa72;hpb=7eadbf885fc9ebd271fa0d7bce3f27394488b059

diff --git a/plugins/gpu-gles/gpuPlugin.h b/plugins/gpu-gles/gpuPlugin.h
index f5e91823..768ebe1f 100644
--- a/plugins/gpu-gles/gpuPlugin.h
+++ b/plugins/gpu-gles/gpuPlugin.h
@@ -46,34 +46,9 @@ extern "C" {
 #define GREEN(x) ((x>>8) & 0xff)
 #define COLOR(x) (x & 0xffffff)
 
-#ifdef _WINDOWS
-#include "Externals.h"
-#include "plugin.h"
-#include <gl/gl.h>
-#else
-//#ifndef MAEMO_CHANGES
-//	#include "psxCommon.h"
-//#else
-//	#include "../psxCommon.h"
-//#endif
+
 #include "gpuExternals.h"
-#ifdef __NANOGL__
-#include <gl/gl.h>
-#else
-#ifdef SOFT_LINKAGE
-#pragma softfp_linkage
-#endif
-#ifndef MAEMO_CHANGES
-	#include <gles/gl.h> // for opengl es types 
-	#include <gles/egltypes.h>
-#else
-#include "gpuStdafx.h"
-#endif
-#ifdef SOFT_LINKAGE
-#pragma no_softfp_linkage
-#endif
-#endif
-#endif
+
 /////////////////////////////////////////////////////////////////////////////
 
 #define CALLBACK
@@ -81,10 +56,10 @@ extern "C" {
 #define bool unsigned short
 
 typedef struct {
-	u32 ulFreezeVersion;
-	u32 ulStatus;
-	u32 ulControl[256];
-	u8 psxVRam[1024*1024*2];
+	unsigned int ulFreezeVersion;
+	unsigned int ulStatus;
+	unsigned int ulControl[256];
+	unsigned char psxVRam[1024*1024*2];
 } GPUFreeze_t;
 
 long CALLBACK GPUinit();
@@ -101,8 +76,8 @@ long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr);
 void CALLBACK GPUupdateLace(void);
 void CALLBACK GPUmakeSnapshot(void);
 long CALLBACK GPUfreeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF);
-long CALLBACK GPUgetScreenPic(u8 * pMem);
-long CALLBACK GPUshowScreenPic(u8 * pMem);
+long CALLBACK GPUgetScreenPic(unsigned char * pMem);
+long CALLBACK GPUshowScreenPic(unsigned char * pMem);
 //void CALLBACK GPUkeypressed(int keycode);
 //void CALLBACK GPUdisplayText(s8 * pText);
 //void CALLBACK GPUclearDynarec(void (CALLBACK *callback)(void));
@@ -121,8 +96,8 @@ void           CheckVRamRead(int x, int y, int dx, int dy, bool bFront);
 void           CheckVRamReadEx(int x, int y, int dx, int dy);
 void           SetFixes(void);
 
-void PaintPicDot(u8 * p,u8 c);
-//void DrawNumBorPic(u8 *pMem, int lSelectedSlot);
+void PaintPicDot(unsigned char * p,unsigned char c);
+//void DrawNumBorPic(unsigned char *pMem, int lSelectedSlot);
 void ResizeWindow();
 
 ////////////////////////////////////////////////////////////////////////////