aboutsummaryrefslogtreecommitdiff
path: root/plugins/gpu-gles
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/gpu-gles')
-rw-r--r--plugins/gpu-gles/gpuDraw.c90
-rw-r--r--plugins/gpu-gles/gpuPlugin.c337
-rw-r--r--plugins/gpu-gles/gpuPrim.c79
-rw-r--r--plugins/gpu-gles/gpuTexture.c21
4 files changed, 16 insertions, 511 deletions
diff --git a/plugins/gpu-gles/gpuDraw.c b/plugins/gpu-gles/gpuDraw.c
index 2eaa825..3842503 100644
--- a/plugins/gpu-gles/gpuDraw.c
+++ b/plugins/gpu-gles/gpuDraw.c
@@ -27,17 +27,7 @@
#define _IN_DRAW
-#ifdef _WINDOWS
-#include "stdafx.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "externals.h"
-#include "gpu.h"
-#include "draw.h"
-#include "prim.h"
-#include "texture.h"
-#else
+
#include "gpuExternals.h"
#include "gpuPlugin.h"
#include "gpuDraw.h"
@@ -48,7 +38,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-#endif
//#include "menu.h"
////////////////////////////////////////////////////////////////////////////////////
@@ -102,13 +91,8 @@
////////////////////////////////////////////////////////////////////////////////////
// draw globals
-#ifdef _WINDOWS
-HDC dcGlobal=NULL;
-HWND hWWindow;
-#else
void glBlendEquationEXT(GLenum mode);
void glColorTableEXT(GLenum target, GLenum internalFormat, GLsizei width, GLenum format,GLenum type, const GLvoid *data);
-#endif
// draw globals; most will be initialized again later (by config or checks)
@@ -158,50 +142,6 @@ GLbitfield uiBufferBits=GL_COLOR_BUFFER_BIT;
// Set OGL pixel format
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-BOOL bSetupPixelFormat(HDC hDC)
-{
- int pixelformat;
- static PIXELFORMATDESCRIPTOR pfd =
- {
- sizeof(PIXELFORMATDESCRIPTOR), // size of this pfd
- 1, // version number
- PFD_DRAW_TO_WINDOW | // support window
- PFD_SUPPORT_OPENGL | // support OpenGL
- PFD_DOUBLEBUFFER, // double buffered
- PFD_TYPE_RGBA, // RGBA type
- 16, // 16-bit color depth (adjusted later)
- 0, 0, 0, 0, 0, 0, // color bits ignored
- 0, // no alpha buffer
- 0, // shift bit ignored
- 0, // no accumulation buffer
- 0, 0, 0, 0, // accum bits ignored
- 0, // z-buffer
- 0,
- 0, // no auxiliary buffer
- PFD_MAIN_PLANE, // main layer
- 0, // reserved
- 0, 0, 0 // layer masks ignored
- };
-
- pfd.cColorBits=iColDepth; // set user color depth
- pfd.cDepthBits=iZBufferDepth; // set user zbuffer (by psx mask)
-
- if((pixelformat=ChoosePixelFormat(hDC,&pfd))==0)
- {
- MessageBox(NULL,"ChoosePixelFormat failed","Error",MB_OK);
- return FALSE;
- }
-
- if(SetPixelFormat(hDC,pixelformat, &pfd)==FALSE)
- {
- MessageBox(NULL,"SetPixelFormat failed","Error",MB_OK);
- return FALSE;
- }
-
- return TRUE;
-}
-#endif
////////////////////////////////////////////////////////////////////////
// Get extension infos (f.e. pal textures / packed pixels)
@@ -216,11 +156,7 @@ void GetExtInfos(void)
bPacked=TRUE; // -> ok
- #ifdef _WINDOWS
- iClampType=GL_CLAMP;
-#else
iClampType=GL_CLAMP_TO_EDGE;
-#endif
}
////////////////////////////////////////////////////////////////////////
@@ -304,10 +240,6 @@ void CreateScanLines(void)
// Initialize OGL
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-HGLRC GLCONTEXT=NULL;
-#endif
-
#define MODE_RAW 0
#define MODE_X11 1
#define MODE_SDL 2
@@ -491,17 +423,6 @@ static void initEGL(void)
int GLinitialize()
{
- //----------------------------------------------------//
-#ifdef _WINDOWS
- HGLRC objectRC;
- // init
- dcGlobal = GetDC(hWWindow); // FIRST: dc/rc stuff
- objectRC = wglCreateContext(dcGlobal);
- GLCONTEXT=objectRC;
- wglMakeCurrent(dcGlobal, objectRC);
- // CheckWGLExtensions(dcGlobal);
- if(bWindowMode) ReleaseDC(hWWindow,dcGlobal); // win mode: release dc again
-#endif
initEGL();
//----------------------------------------------------//
@@ -591,13 +512,6 @@ void GLcleanup()
{
CleanupTextureStore(); // bye textures
-#ifdef _WINDOWS
- wglMakeCurrent(NULL, NULL); // bye context
- if(GLCONTEXT) wglDeleteContext(GLCONTEXT);
- if(!bWindowMode && dcGlobal)
- ReleaseDC(hWWindow,dcGlobal);
-#endif
-
eglMakeCurrent( display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT );
eglDestroySurface( display, surface );
eglDestroyContext( display, context );
@@ -1307,9 +1221,7 @@ void assignTexture4(void)
// render pos / buffers
////////////////////////////////////////////////////////////////////////
-#ifndef _WINDOWS
#define EqualRect(pr1,pr2) ((pr1)->left==(pr2)->left && (pr1)->top==(pr2)->top && (pr1)->right==(pr2)->right && (pr1)->bottom==(pr2)->bottom)
-#endif
////////////////////////////////////////////////////////////////////////
// SetDisplaySettings: "simply" calcs the new drawing area and updates
diff --git a/plugins/gpu-gles/gpuPlugin.c b/plugins/gpu-gles/gpuPlugin.c
index 368c5ce..54147ef 100644
--- a/plugins/gpu-gles/gpuPlugin.c
+++ b/plugins/gpu-gles/gpuPlugin.c
@@ -27,25 +27,8 @@
//#include "gpuStdafx.h"
//#include <mmsystem.h>
-
#define _IN_GPU
-#ifdef _WINDOWS
-#include "stdafx.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <mmsystem.h>
-
-#include "externals.h"
-#include "gpu.h"
-#include "draw.h"
-#include "prim.h"
-#include "texture.h"
-#include "fps.h"
-#include "resource.h"
-#else
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
@@ -60,10 +43,7 @@
//#include "NoPic.h"
#include "gpuStdafx.h"
-#endif
-extern void ProcessEvents();
-
short g_m1=255,g_m2=255,g_m3=255;
short DrawSemiTrans=FALSE;
short Ymin;
@@ -100,10 +80,6 @@ BOOL bNeedInterlaceUpdate=FALSE;
BOOL bNeedRGB24Update=FALSE;
BOOL bChangeWinMode=FALSE;
-#ifdef _WINDOWS
-extern HGLRC GLCONTEXT;
-#endif
-
unsigned long ulStatusControl[256];
////////////////////////////////////////////////////////////////////////
@@ -155,28 +131,12 @@ int iRumbleVal = 0;
int iRumbleTime = 0;
static void (*rearmed_get_layer_pos)(int *x, int *y, int *w, int *h);
+static void flipEGL(void);
////////////////////////////////////////////////////////////////////////
// stuff to make this a true PDK module
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-char * CALLBACK PSEgetLibName(void)
-{
- return "name";
-}
-
-unsigned long CALLBACK PSEgetLibType(void)
-{
- return 1;
-}
-
-unsigned long CALLBACK PSEgetLibVersion(void)
-{
- return 1<<16|1<<8|1;
-}
-#endif
-
////////////////////////////////////////////////////////////////////////
// snapshot funcs (saves screen to bitmap / text infos into file)
////////////////////////////////////////////////////////////////////////
@@ -210,9 +170,6 @@ void ResizeWindow()
char * GetConfigInfos(int hW)
{
-#ifdef _WINDOWS
- HDC hdc;HGLRC hglrc;
-#endif
char szO[2][4]={"off","on "};
char szTxt[256];
char * pB=(char *)malloc(32767);
@@ -395,11 +352,7 @@ void DoSnapShot(void)
{
}
-#ifdef _WINDOWS
-void CALLBACK GPUmakeSnapshot(void)
-#else
void CALLBACK GPUmakeSnapshot(void)
-#endif
{
//bSnapShot = TRUE;
}
@@ -408,26 +361,12 @@ void CALLBACK GPUmakeSnapshot(void)
// GPU INIT... here starts it all (first func called by emu)
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-long CALLBACK GPUinit()
-#else
long CALLBACK GPUinit()
-#endif
{
memset(ulStatusControl,0,256*sizeof(unsigned long));
-#ifdef _WINDOWS
-iResX=240;iResY=320;
-#endif
bChangeRes=FALSE;
-#ifdef _WINDOWS
-bWindowMode=TRUE;
-#else
bWindowMode=FALSE;
-#endif
-#ifdef _WINDOWS
-iWinSize=MAKELONG(iResX,iResY);
-#endif
bKeepRatio = TRUE;
// different ways of accessing PSX VRAM
@@ -501,33 +440,6 @@ return 0;
////////////////////////////////////////////////////////////////////////
-// GPU OPEN: funcs to open up the gpu display (Windows)
-////////////////////////////////////////////////////////////////////////
-
-#ifdef _WINDOWS
-
-void ChangeDesktop() // change destop resolution
-{
- DEVMODE dv;long lRes,iTry=0;
-
- while(iTry<10) // keep on hammering...
- {
- memset(&dv,0,sizeof(DEVMODE));
- dv.dmSize=sizeof(DEVMODE);
- dv.dmBitsPerPel=iColDepth;
- dv.dmPelsWidth=iResX;
- dv.dmPelsHeight=iResY;
-
- dv.dmFields=DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
-
- lRes=ChangeDisplaySettings(&dv,0); // ...hammering the anvil
-
- if(lRes==DISP_CHANGE_SUCCESSFUL) return;
- iTry++;Sleep(10);
- }
-}
-
-////////////////////////////////////////////////////////////////////////
// OPEN interface func: attention!
// some emus are calling this func in their main Window thread,
// but all other interface funcs (to draw stuff) in a different thread!
@@ -541,33 +453,12 @@ void ChangeDesktop() // change destop resoluti
// some PAD or SPU plugins would not work anymore)
////////////////////////////////////////////////////////////////////////
-HMENU hPSEMenu=NULL;
-
-long CALLBACK GPUopen(HWND hwndGPU)
-#else
long CALLBACK GPUopen(int hwndGPU)
-#endif
{
- #ifdef _WINDOWS
- HDC hdc;RECT r;DEVMODE dv;
-
- hWWindow = hwndGPU; // store hwnd globally
- #endif
- // InitKeyHandler(); // init key handler (subclass window)
-
-
-
- #ifdef _WINDOWS
- iResX=240;iResY=320;
- #endif
iResX=800;iResY=480;
iColDepth=8;
bChangeRes=FALSE;
- #ifdef _WINDOWS
- bWindowMode=TRUE;
- #else
bWindowMode=FALSE;
- #endif
bFullVRam=FALSE;
iFilterType=0;
// bAdvancedBlend=FALSE;
@@ -581,9 +472,6 @@ long CALLBACK GPUopen(int hwndGPU)
//bOpaquePass=FALSE;
//bUseAntiAlias=FALSE;
//iTexQuality=0;
- #ifdef _WINDOWS
- iWinSize=MAKELONG(iResX,iResY);
- #endif
iUseMask=0;
iZBufferDepth=0;
bUseFastMdec=FALSE;
@@ -605,65 +493,12 @@ long CALLBACK GPUopen(int hwndGPU)
-#ifdef _WINDOWS
- memset(&dv,0,sizeof(DEVMODE));
- dv.dmSize=sizeof(DEVMODE);
- EnumDisplaySettings(NULL,ENUM_CURRENT_SETTINGS,&dv);
-#endif
bIsFirstFrame = TRUE; // flag: we have to init OGL later in windows!
-#ifdef _WINDOWS
- if(bWindowMode) // win mode?
- {
- DWORD dw=GetWindowLong(hWWindow, GWL_STYLE); // -> adjust wnd style (owndc needed by some stupid ogl drivers)
- dw&=~WS_THICKFRAME;
- dw|=WS_BORDER|WS_CAPTION|CS_OWNDC;
- SetWindowLong(hWWindow, GWL_STYLE, dw);
-
- hPSEMenu=GetMenu(hWWindow); // -> hide emu menu (if any)
- if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);
-
- iResX=LOWORD(iWinSize);iResY=HIWORD(iWinSize);
- ShowWindow(hWWindow,SW_SHOWNORMAL);
-
- MoveWindow(hWWindow, // -> center wnd
- GetSystemMetrics(SM_CXFULLSCREEN)/2-iResX/2,
- GetSystemMetrics(SM_CYFULLSCREEN)/2-iResY/2,
- iResX+GetSystemMetrics(SM_CXFIXEDFRAME)+3,
- iResY+GetSystemMetrics(SM_CYFIXEDFRAME)+GetSystemMetrics(SM_CYCAPTION)+3,
- TRUE);
- UpdateWindow(hWWindow); // -> let windows do some update
-
- if(dv.dmBitsPerPel==16 || dv.dmBitsPerPel==32) // -> overwrite user color info with desktop color info
- iColDepth=dv.dmBitsPerPel;
- }
- else // fullscreen mode:
- {
- if(dv.dmBitsPerPel!=(unsigned int)iColDepth || // -> check, if we have to change resolution
- dv.dmPelsWidth !=(unsigned int)iResX ||
- dv.dmPelsHeight!=(unsigned int)iResY)
- bChangeRes=TRUE; else bChangeRes=FALSE;
-
- if(bChangeRes) ChangeDesktop(); // -> change the res (had to do an own func because of some MS 'optimizations')
-
- SetWindowLong(hWWindow, GWL_STYLE, CS_OWNDC); // -> adjust wnd style as well (to be sure)
-
- hPSEMenu=GetMenu(hWWindow); // -> hide menu
- if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);
- ShowWindow(hWWindow,SW_SHOWMAXIMIZED); // -> max mode
- }
-#endif
rRatioRect.left = rRatioRect.top=0;
rRatioRect.right = iResX;
rRatioRect.bottom = iResY;
-#ifdef _WINDOWS
- r.left=r.top=0;r.right=iResX;r.bottom=iResY; // hack for getting a clean black window until OGL gets initialized
- hdc = GetDC(hWWindow);
- FillRect(hdc,&r,(HBRUSH)GetStockObject(BLACK_BRUSH));
- bSetupPixelFormat(hdc);
- ReleaseDC(hWWindow,hdc);
-#endif
bDisplayNotSet = TRUE;
bSetClip=TRUE;
@@ -683,28 +518,6 @@ long CALLBACK GPUopen(int hwndGPU)
// close
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-long CALLBACK GPUclose() // WINDOWS CLOSE
-{
-// ExitKeyHandler();
-
- GLcleanup(); // close OGL
-
- if(bChangeRes) // change res back
- ChangeDisplaySettings(NULL,0);
-
- if(hPSEMenu) // set menu again
- SetMenu(hWWindow,hPSEMenu);
-
- if(pGfxCardScreen) free(pGfxCardScreen); // free helper memory
- pGfxCardScreen=0;
-
-// if(iNoScreenSaver) EnableScreenSaver(TRUE); // enable screen saver again
-
- return 0;
-}
-
-#else
long GPUclose() // LINUX CLOSE
{
@@ -717,17 +530,12 @@ long GPUclose() // LINUX CLOSE
return 0;
}
-#endif
////////////////////////////////////////////////////////////////////////
// I shot the sheriff... last function called from emu
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
long CALLBACK GPUshutdown()
-#else
-long CALLBACK GPUshutdown()
-#endif
{
if(psxVSecure) free(psxVSecure); // kill emulated vram memory
psxVSecure=0;
@@ -791,10 +599,6 @@ void updateDisplay(void) // UPDATE DISPLAY
{
BOOL bBlur=FALSE;
-#ifdef _WINDOWS
-HDC hdc=GetDC(hWWindow); // windows:
-wglMakeCurrent(hdc,GLCONTEXT); // -> make context current again
-#endif
bFakeFrontBuffer=FALSE;
bRenderFrontBuffer=FALSE;
@@ -882,29 +686,16 @@ if(bUseFrameSkip) // frame skipping active ?
{
if(!bSkipNextFrame)
{
- if(iDrawnSomething)
-#ifdef _WINDOWS
- SwapBuffers(wglGetCurrentDC()); // -> to skip or not to skip
-#else
- eglSwapBuffers(display,surface);
-#endif
+ if(iDrawnSomething) flipEGL();
}
- if(dwActFixes&0x180) // -> special old frame skipping: skip max one in a row
- {
if((fps_skip < fFrameRateHz) && !(bSkipNextFrame))
{bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
else bSkipNextFrame = FALSE;
- }
- else FrameSkip();
+
}
else // no skip ?
{
- if(iDrawnSomething)
-#ifdef _WINDOWS
- SwapBuffers(wglGetCurrentDC()); // -> swap
-#else
- eglSwapBuffers(display,surface);
-#endif
+ if(iDrawnSomething) flipEGL();
}
iDrawnSomething=0;
@@ -1018,18 +809,9 @@ bRenderFrontBuffer=FALSE;
// if(gTexPicName) DisplayPic();
// if(ulKeybits&KEY_SHOWFPS) DisplayText();
-#ifdef _WINDOWS
- { // windows:
- HDC hdc=GetDC(hWWindow);
- wglMakeCurrent(hdc,GLCONTEXT); // -> make current again
- if(iDrawnSomething)
- SwapBuffers(wglGetCurrentDC()); // -> swap
- ReleaseDC(hWWindow,hdc); // -> ! important !
- }
-#else
if(iDrawnSomething) // linux:
- eglSwapBuffers(display,surface);
-#endif
+ flipEGL();
+
//if(iBlurBuffer) UnBlurBackBuffer();
}
@@ -1241,15 +1023,6 @@ if(bUp) updateDisplay(); // yeah, real update (swap
// window mode <-> fullscreen mode (windows)
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-void ChangeWindowMode(void)
-{
- GPUclose();
- bWindowMode=!bWindowMode;
- GPUopen(hWWindow);
- bChangeWinMode=FALSE;
-}
-#endif
////////////////////////////////////////////////////////////////////////
// swap update check (called by psx vsync function)
@@ -1317,11 +1090,7 @@ return FALSE;
static unsigned short usFirstPos=2;
-#ifdef _WINDOWS
void CALLBACK GPUupdateLace(void)
-#else
-void CALLBACK GPUupdateLace(void)
-#endif
{
if(!(dwActFixes&0x1000))
STATUSREG^=0x80000000; // interlaced bit toggle, if the CC game fix is not active (see gpuReadStatus)
@@ -1350,20 +1119,13 @@ else if(usFirstPos==1) // initial updates (after
updateDisplay();
}
-#ifdef _WINDOWS
-if(bChangeWinMode) ChangeWindowMode();
-#endif
}
////////////////////////////////////////////////////////////////////////
// process read request from GPU status register
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-unsigned long CALLBACK GPUreadStatus(void)
-#else
unsigned long CALLBACK GPUreadStatus(void)
-#endif
{
if(dwActFixes&0x1000) // CC game fix
{
@@ -1399,17 +1161,11 @@ return STATUSREG;
// these are always single packet commands.
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
void CALLBACK GPUwriteStatus(unsigned long gdata)
-#else
-void CALLBACK GPUwriteStatus(unsigned long gdata)
-#endif
{
unsigned long lCommand=(gdata>>24)&0xff;
-#ifdef _WINDOWS
if(bIsFirstFrame) GLinitialize(); // real ogl startup (needed by some emus)
-#endif
ulStatusControl[lCommand]=gdata;
@@ -2015,11 +1771,7 @@ void CheckVRamRead(int x, int y, int dx, int dy, bool bFront)
// core read from vram
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-void CALLBACK GPUreadDataMem(unsigned int * pMem, int iSize)
-#else
void CALLBACK GPUreadDataMem(unsigned long * pMem, int iSize)
-#endif
{
int i;
@@ -2091,18 +1843,10 @@ ENDREAD:
GPUIsIdle;
}
-#ifdef _WINDOWS
unsigned long CALLBACK GPUreadData(void)
-#else
-unsigned long CALLBACK GPUreadData(void)
-#endif
{
unsigned long l;
-#ifdef _WINDOWS
GPUreadDataMem(&l,1);
-#else
- GPUreadDataMem(&l,1);
-#endif
return GPUdataRet;
}
@@ -2184,11 +1928,7 @@ const unsigned char primTableCX[256] =
// processes data send to GPU data register
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)
-#else
void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)
-#endif
{
unsigned char command;
unsigned long gdata=0;
@@ -2307,17 +2047,9 @@ GPUIsIdle;
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-void CALLBACK GPUwriteData(unsigned long gdata)
-#else
void CALLBACK GPUwriteData(unsigned long gdata)
-#endif
{
-#ifdef _WINDOWS
GPUwriteDataMem(&gdata,1);
-#else
- GPUwriteDataMem(&gdata,1);
-#endif
}
////////////////////////////////////////////////////////////////////////
@@ -2401,22 +2133,9 @@ void StartCfgTool(char * pCmdLine) // linux: start external
#endif
-#ifdef _WINDOWS
-long CALLBACK GPUconfigure(void)
-#else
long CALLBACK GPUconfigure(void)
-#endif
{
-#ifdef _WINDOWS
-// HWND hWP=GetActiveWindow();
-// DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG),
-// hWP,(DLGPROC)CfgDlgProc);
-#else
-
-// StartCfgTool("CFG");
-
-#endif
return 0;
}
@@ -2455,11 +2174,7 @@ return FALSE;
// core gives a dma chain to gpu: same as the gpuwrite interface funcs
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr)
-#else
-long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr)
-#endif
{
unsigned long dmaMem;
unsigned char * baseAddrB;
@@ -2484,11 +2199,7 @@ do
dmaMem=addr+4;
-#ifdef _WINDOWS
- if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);
-#else
if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);
-#endif
addr = baseAddrL[addr>>2]&0xffffff;
}
@@ -2503,11 +2214,7 @@ return 0;
// show about dlg
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-void CALLBACK GPUabout(void)
-#else
void CALLBACK GPUabout(void)
-#endif
{
}
@@ -2516,11 +2223,7 @@ void CALLBACK GPUabout(void)
// We are ever fine ;)
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
long CALLBACK GPUtest(void)
-#else
-long CALLBACK GPUtest(void)
-#endif
{
// if test fails this function should return negative value for error (unable to continue)
// and positive value for warning (can continue but output might be crappy)
@@ -2534,11 +2237,7 @@ long CALLBACK GPUtest(void)
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-long CALLBACK GPUfreeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF)
-#else
long CALLBACK GPUfreeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF)
-#endif
{
if(ulGetFreezeData==2)
{
@@ -2569,17 +2268,6 @@ memcpy(psxVub, pF->psxVRam, 1024*iGPUHeight*2);
ResetTextureArea(TRUE);
-#ifdef _WINDOWS
- GPUwriteStatus(ulStatusControl[0]);
- GPUwriteStatus(ulStatusControl[1]);
- GPUwriteStatus(ulStatusControl[2]);
- GPUwriteStatus(ulStatusControl[3]);
- GPUwriteStatus(ulStatusControl[8]);
- GPUwriteStatus(ulStatusControl[6]);
- GPUwriteStatus(ulStatusControl[7]);
- GPUwriteStatus(ulStatusControl[5]);
- GPUwriteStatus(ulStatusControl[4]);
-#else
GPUwriteStatus(ulStatusControl[0]);
GPUwriteStatus(ulStatusControl[1]);
GPUwriteStatus(ulStatusControl[2]);
@@ -2589,7 +2277,6 @@ ResetTextureArea(TRUE);
GPUwriteStatus(ulStatusControl[7]);
GPUwriteStatus(ulStatusControl[5]);
GPUwriteStatus(ulStatusControl[4]);
-#endif
return 1;
}
@@ -2837,11 +2524,7 @@ void PaintPicDot(unsigned char * p,unsigned char c)
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-void CALLBACK GPUgetScreenPic(unsigned char * pMem)
-#else
long CALLBACK GPUgetScreenPic(unsigned char * pMem)
-#endif
{
float XS,YS;int x,y,v;
unsigned char * ps, * px, * pf;
@@ -2920,11 +2603,7 @@ long CALLBACK GPUgetScreenPic(unsigned char * pMem)
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-void CALLBACK GPUshowScreenPic(unsigned char * pMem)
-#else
long CALLBACK GPUshowScreenPic(unsigned char * pMem)
-#endif
{
// DestroyPic();
// if(pMem==0) return;
@@ -2971,3 +2650,7 @@ void CALLBACK GPUrearmedCallbacks(const void **cbs)
rearmed_get_layer_pos = cbs[0];
}
+static void flipEGL(void)
+{
+ eglSwapBuffers(display, surface);
+}
diff --git a/plugins/gpu-gles/gpuPrim.c b/plugins/gpu-gles/gpuPrim.c
index 7772dba..37db052 100644
--- a/plugins/gpu-gles/gpuPrim.c
+++ b/plugins/gpu-gles/gpuPrim.c
@@ -26,13 +26,6 @@
#define _IN_PRIMDRAW
-#ifdef _WINDOWS
-#include "stdafx.h"
-#include "externals.h"
-#include "gpu.h"
-#include "draw.h"
-#include "texture.h"
-#else
#include "gpuStdafx.h"
#include "gpuExternals.h"
#include "gpuPlugin.h"
@@ -40,8 +33,6 @@
#include "gpuTexture.h"
#include "gpuPrim.h"
-#endif
-
////////////////////////////////////////////////////////////////////////
// defines
////////////////////////////////////////////////////////////////////////
@@ -53,10 +44,9 @@
// globals
////////////////////////////////////////////////////////////////////////
-//#ifndef _WINDOWS
-//EGLSurface surface;
-//EGLDisplay display;
-//#endif
+EGLSurface surface;
+EGLDisplay display;
+
BOOL bDrawTextured; // current active drawing states
BOOL bDrawSmoothShaded;
@@ -146,66 +136,6 @@ void UpdateGlobalTP(unsigned short gdata)
// Some ASM color convertion... Lewpy's special...
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-#pragma warning (disable : 4035)
-
-unsigned long DoubleBGR2RGB (unsigned long BGR)
-{
-
- __asm
- {
- mov eax, BGR /* this can hold the G value */
- mov ebx, eax /* this can hold the R value */
- mov edx, eax /* this can hold the B value */
- and ebx, 000000ffh /* mask the R value */
- shl ebx, 1
- test ebx, 00000100h
- jz RSKIP
- mov ebx, 000000ffh
-
-RSKIP:
- and eax, 0000ff00h /* mask the G value */
- shl eax, 1
- test eax, 00010000h
- jz GSKIP
- mov eax, 0000ff00h
-
-GSKIP:
- and edx, 00ff0000h /* mask the B value */
- shl edx, 1
- test edx, 01000000h
- jz BSKIP
- mov edx, 00ff0000h
-
-BSKIP:
- or eax, ebx /* add R to G value */
- or eax, edx /* add B to RG value */
- }
- /* Result returned in EAX */
-}
-
-unsigned short BGR24to16 (unsigned long BGR)
-{
- __asm
- {
- mov eax, BGR /* this can hold the G value */
- mov ebx, eax /* this can hold the R value */
- mov edx, eax /* this can hold the B value */
- shr ebx, 3 /* move the R value */
- and edx, 00f80000h /* mask the B value */
- shr edx, 9 /* move the B value */
- and eax, 00f800h /* mask the G value */
- shr eax, 6 /* move the G value */
- and ebx, 0000001fh /* mask the R value */
- or eax, ebx /* add R to G value */
- or eax, edx /* add B to RG value */
- }
- /* Result returned in AX */
-}
-
-#pragma warning (default : 4035)
-
-#else
unsigned long DoubleBGR2RGB (unsigned long BGR)
{
@@ -228,13 +158,12 @@ unsigned short BGR24to16 (unsigned long BGR)
return ((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6);
}
-#endif
////////////////////////////////////////////////////////////////////////
// OpenGL primitive drawing commands
////////////////////////////////////////////////////////////////////////
-__inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
+void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3, OGLVertex* vertex4)
{
diff --git a/plugins/gpu-gles/gpuTexture.c b/plugins/gpu-gles/gpuTexture.c
index f057951..c3d88f9 100644
--- a/plugins/gpu-gles/gpuTexture.c
+++ b/plugins/gpu-gles/gpuTexture.c
@@ -67,14 +67,6 @@
#define _IN_TEXTURE
-#ifdef _WINDOWS
-#include "stdafx.h"
-
-#include "externals.h"
-#include "texture.h"
-#include "gpu.h"
-#include "prim.h"
-#else
#include "gpuStdafx.h"
#include "gpuDraw.h"
@@ -83,7 +75,7 @@
#include "gpuTexture.h"
#include "gpuPlugin.h"
#include "gpuPrim.h"
-#endif
+
#define CLUTCHK 0x00060000
#define CLUTSHIFT 17
@@ -98,11 +90,7 @@ GLuint gTexFrameName=0;
int iTexGarbageCollection=1;
unsigned long dwTexPageComp=0;
int iVRamSize=0;
-#ifdef _WINDOWS
-int iClampType=GL_CLAMP;
-#else
int iClampType=GL_CLAMP_TO_EDGE;
-#endif
int iFilter = GL_LINEAR;
void (*LoadSubTexFn) (int,int,short,short);
unsigned long (*PalTexturedColourFn) (unsigned long);
@@ -166,10 +154,6 @@ unsigned short (*PTCF[2]) (unsigned short);
// texture cache implementation
////////////////////////////////////////////////////////////////////////
-#ifdef _WINDOWS
-#pragma pack(1)
-#endif
-
// "texture window" cache entry
typedef struct textureWndCacheEntryTag
@@ -195,9 +179,6 @@ typedef struct textureSubCacheEntryTagS
unsigned char Opaque;
} textureSubCacheEntryS;
-#ifdef _WINDOWS
-#pragma pack()
-#endif
//---------------------------------------------
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 03:27:55 +0000