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
release r21
[pcsx_rearmed.git]
/
frontend
/
plat_omap.c
diff --git
a/frontend/plat_omap.c
b/frontend/plat_omap.c
index
b8ab19b
..
4e3ea79
100644
(file)
--- a/
frontend/plat_omap.c
+++ b/
frontend/plat_omap.c
@@
-14,10
+14,10
@@
#include <unistd.h>
#include <linux/omapfb.h>
#include <unistd.h>
#include <linux/omapfb.h>
-#include "
common
/menu.h"
-#include "
common
/input.h"
-#include "linux/fbdev.h"
-#include "linux/xenv.h"
+#include "
libpicofe
/menu.h"
+#include "
libpicofe
/input.h"
+#include "li
bpicofe/li
nux/fbdev.h"
+#include "li
bpicofe/li
nux/xenv.h"
#include "plugin_lib.h"
#include "pl_gun_ts.h"
#include "plat.h"
#include "plugin_lib.h"
#include "pl_gun_ts.h"
#include "plat.h"
@@
-52,8
+52,9
@@
static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
perror("SETUP_PLANE");
}
perror("SETUP_PLANE");
}
- if (mi.size < 640*512*3*3) {
- mi.size = 640*512*3*3;
+ // upto 1024x512 (2x resolution enhancement)
+ if (mi.size < 1024*512*2 * 3) {
+ mi.size = 1024*512*2 * 3;
ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
if (ret != 0) {
perror("SETUP_MEM");
ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
if (ret != 0) {
perror("SETUP_MEM");
@@
-93,12
+94,26
@@
void plat_omap_gvideo_open(void)
vout_fbdev_wait_vsync(layer_fb);
}
vout_fbdev_wait_vsync(layer_fb);
}
-void *plat_gvideo_set_mode(int *w
, int *h
, int *bpp)
+void *plat_gvideo_set_mode(int *w
_in, int *h_in
, int *bpp)
{
{
+ int l = 0, r = 0, t = 0, b = 0;
+ int w = *w_in, h = *h_in;
void *buf;
void *buf;
+ if (g_scaler == SCALE_1_1 || g_scaler == SCALE_2_2) {
+ if (w > g_menuscreen_w) {
+ l = r = (w - g_menuscreen_w) / 2;
+ w -= l + r;
+ }
+ if (h > g_menuscreen_h) {
+ t = b = (h - g_menuscreen_h) / 2;
+ h -= t + b;
+ }
+ }
+
vout_fbdev_clear(layer_fb);
vout_fbdev_clear(layer_fb);
- buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp, 0, 0, 0, 0, 3);
+ buf = vout_fbdev_resize(layer_fb, w, h, *bpp,
+ l, r, t, b, 3);
omap_enable_layer(1);
omap_enable_layer(1);