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=c4520322271a5cb9da10a515c5cb32aa64afe379;hb=0507e4f1e5c28ea0e5214b32ed1f6f571f7b8066;hpb=ce879073e4f228deec8bec5db8a2ff640636c88f;ds=sidebyside

diff --git a/plugins/gpu-gles/gpuPlugin.h b/plugins/gpu-gles/gpuPlugin.h
index c4520322..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,38 +56,38 @@ 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 GPU_init();
-long CALLBACK GPU_shutdown();
-long CALLBACK GPU_open(int hwndGPU);                    
-long CALLBACK GPU_close();
-unsigned long CALLBACK GPU_readData(void);
-void CALLBACK GPU_readDataMem(unsigned long * pMem, int iSize);
-unsigned long CALLBACK GPU_readStatus(void);
-void CALLBACK GPU_writeData(unsigned long gdata);
-void CALLBACK GPU_writeDataMem(unsigned long * pMem, int iSize);
-void CALLBACK GPU_writeStatus(unsigned long gdata);
-long CALLBACK GPU_dmaChain(unsigned long * baseAddrL, unsigned long addr);
-void CALLBACK GPU_updateLace(void);
-void CALLBACK GPU_makeSnapshot(void);
-long CALLBACK GPU_freeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF);
-long CALLBACK GPU_getScreenPic(u8 * pMem);
-long CALLBACK GPU_showScreenPic(u8 * pMem);
-//void CALLBACK GPU_keypressed(int keycode);
-//void CALLBACK GPU_displayText(s8 * pText);
-//void CALLBACK GPU_clearDynarec(void (CALLBACK *callback)(void));
-long CALLBACK GPU_configure(void);
-long CALLBACK GPU_test(void);
-void CALLBACK GPU_about(void);
+long CALLBACK GPUinit();
+long CALLBACK GPUshutdown();
+long CALLBACK GPUopen(int hwndGPU);
+long CALLBACK GPUclose();
+unsigned long CALLBACK GPUreadData(void);
+void CALLBACK GPUreadDataMem(unsigned long * pMem, int iSize);
+unsigned long CALLBACK GPUreadStatus(void);
+void CALLBACK GPUwriteData(unsigned long gdata);
+void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize);
+void CALLBACK GPUwriteStatus(unsigned long gdata);
+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(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));
+long CALLBACK GPUconfigure(void);
+long CALLBACK GPUtest(void);
+void CALLBACK GPUabout(void);
 
 
 void           DoSnapShot(void);
-void		   GPU_vSinc(void);
+void		   GPUvSinc(void);
 void           updateDisplay(void);
 void           updateFrontDisplay(void);
 void           SetAutoFrameCap(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();
 
 ////////////////////////////////////////////////////////////////////////////