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
psxmem: set fixed flag on mappings that really need it
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpuPlugin.c
diff --git
a/plugins/gpu-gles/gpuPlugin.c
b/plugins/gpu-gles/gpuPlugin.c
index
d6e6fbb
..
897c942
100644
(file)
--- a/
plugins/gpu-gles/gpuPlugin.c
+++ b/
plugins/gpu-gles/gpuPlugin.c
@@
-154,6
+154,8
@@
int iFakePrimBusy = 0;
int iRumbleVal = 0;
\r
int iRumbleTime = 0;
\r
\r
int iRumbleVal = 0;
\r
int iRumbleTime = 0;
\r
\r
+static void (*rearmed_get_layer_pos)(int *x, int *y, int *w, int *h);
\r
+
\r
////////////////////////////////////////////////////////////////////////
\r
// stuff to make this a true PDK module
\r
////////////////////////////////////////////////////////////////////////
\r
////////////////////////////////////////////////////////////////////////
\r
// stuff to make this a true PDK module
\r
////////////////////////////////////////////////////////////////////////
\r
@@
-559,7
+561,7
@@
long CALLBACK GPUopen(int hwndGPU)
iResX=240;iResY=320;
\r
#endif
\r
#ifdef MAEMO_CHANGES
\r
iResX=240;iResY=320;
\r
#endif
\r
#ifdef MAEMO_CHANGES
\r
- iResX=
64
0;iResY=480;
\r
+ iResX=
80
0;iResY=480;
\r
#endif
\r
iColDepth=8;
\r
bChangeRes=FALSE;
\r
#endif
\r
iColDepth=8;
\r
bChangeRes=FALSE;
\r
@@
-1119,6
+1121,7
@@
float xs,ys,s;RECT r;
if(!PSXDisplay.DisplayModeNew.x) return;
\r
if(!PSXDisplay.DisplayModeNew.y) return;
\r
\r
if(!PSXDisplay.DisplayModeNew.x) return;
\r
if(!PSXDisplay.DisplayModeNew.y) return;
\r
\r
+#if 0
\r
xs=(float)iResX/(float)PSXDisplay.DisplayModeNew.x;
\r
ys=(float)iResY/(float)PSXDisplay.DisplayModeNew.y;
\r
\r
xs=(float)iResX/(float)PSXDisplay.DisplayModeNew.x;
\r
ys=(float)iResY/(float)PSXDisplay.DisplayModeNew.y;
\r
\r
@@
-1170,7
+1173,11
@@
if(r.bottom<rRatioRect.bottom ||
}
\r
\r
rRatioRect=r;
\r
}
\r
\r
rRatioRect=r;
\r
-
\r
+#else
\r
+ // pcsx-rearmed hack
\r
+ if (rearmed_get_layer_pos != NULL)
\r
+ rearmed_get_layer_pos(&rRatioRect.left, &rRatioRect.top, &rRatioRect.right, &rRatioRect.bottom);
\r
+#endif
\r
\r
glViewport(rRatioRect.left,
\r
iResY-(rRatioRect.top+rRatioRect.bottom),
\r
\r
glViewport(rRatioRect.left,
\r
iResY-(rRatioRect.top+rRatioRect.bottom),
\r
@@
-2959,3
+2966,10
@@
void CALLBACK GPUdisplayFlags(unsigned long dwFlags)
{
\r
// dwCoreFlags=dwFlags;
\r
}
\r
{
\r
// dwCoreFlags=dwFlags;
\r
}
\r
+
\r
+// pcsx-rearmed callbacks
\r
+void CALLBACK GPUrearmedCallbacks(const void **cbs)
\r
+{
\r
+ rearmed_get_layer_pos = cbs[0];
\r
+}
\r
+
\r