pandora: handle custom size fb for menu layer

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@897 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/common/menu.c b/common/menu.c
index 8b69d20..d11343b 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -31,7 +31,7 @@ void *g_menubg_ptr;
 \r
 #ifndef UIQ3\r
 \r
-#if !SCREEN_SIZE_FIXED\r
+#if !MSCREEN_SIZE_FIXED\r
 int g_menuscreen_w = MSCREEN_WIDTH;\r
 int g_menuscreen_h = MSCREEN_HEIGHT;\r
 #endif\r

diff --git a/common/menu.h b/common/menu.h
index 386b37e..7539948 100644 (file)
--- a/common/menu.h
+++ b/common/menu.h
@@ -188,7 +188,7 @@ extern me_bind_action emuctrl_actions[];    // platform code
 extern void *g_menubg_src_ptr;
 extern void *g_menubg_ptr;
 extern void *g_menuscreen_ptr;
-#if SCREEN_SIZE_FIXED
+#if MSCREEN_SIZE_FIXED
 #define g_menuscreen_w MSCREEN_WIDTH
 #define g_menuscreen_h MSCREEN_HEIGHT
 #else

diff --git a/gp2x/port_config.h b/gp2x/port_config.h
index 2002302..a4eef7b 100644 (file)
--- a/gp2x/port_config.h
+++ b/gp2x/port_config.h
@@ -11,6 +11,7 @@
 #define SCREEN_SIZE_FIXED 1\r
 #define SCREEN_WIDTH  320\r
 #define SCREEN_HEIGHT 240\r
+#define MSCREEN_SIZE_FIXED 1\r
 #define MSCREEN_WIDTH  SCREEN_WIDTH\r
 #define MSCREEN_HEIGHT SCREEN_HEIGHT\r
 \r

diff --git a/linux/io.c b/linux/io.c
index 3fc5cc2..efd476e 100644 (file)
--- a/linux/io.c
+++ b/linux/io.c
@@ -5,6 +5,7 @@
 
 #include "../common/emu.h"
 #include "../common/menu.h"
+#include "../common/plat.h"
 #include "sndout_oss.h"
 #include "version.h"
 
@@ -252,8 +253,8 @@ static void xlib_init(void)
 static void realloc_screen(void)
 {
        int size = scr_w * scr_h * 2;
-       g_menuscreen_w = scr_w;
-       g_menuscreen_h = scr_h;
+       g_screen_width = g_menuscreen_w = scr_w;
+       g_screen_height = g_menuscreen_h = scr_h;
        g_screen_ptr = realloc(g_screen_ptr, size);
        g_menubg_ptr = realloc(g_menubg_ptr, size);
        memset(g_screen_ptr, 0, size);
@@ -302,6 +303,9 @@ void plat_video_flip(void)
        if (scr_changed) {
                realloc_screen();
                ximage_realloc(xlib_display, DefaultVisual(xlib_display, 0));
+
+               // propagate new ponters to renderers
+               plat_video_toggle_renderer(0, 0);
        }
 }
 
@@ -322,9 +326,8 @@ void plat_init(void)
        ret = vout_fbdev_init(&w, &h);
        if (ret != 0)
                exit(1);
-       g_menuscreen_w = w;
-       g_menuscreen_h = h;
-       g_screen_width = w;
+       g_screen_width = g_menuscreen_w = w;
+       g_screen_height = g_menuscreen_h = h;
        g_menubg_ptr = realloc(g_menubg_ptr, w * g_screen_height * 2);
        PicoDraw2FB = g_menubg_ptr;
 #else

diff --git a/linux/port_config.h b/linux/port_config.h
index d8fa108..71543f3 100644 (file)
--- a/linux/port_config.h
+++ b/linux/port_config.h
@@ -12,6 +12,7 @@
 #define SCREEN_SIZE_FIXED 0
 #define SCREEN_WIDTH  320
 #define SCREEN_HEIGHT 240
+#define MSCREEN_SIZE_FIXED 0
 #define MSCREEN_WIDTH  SCREEN_WIDTH
 #define MSCREEN_HEIGHT SCREEN_HEIGHT
 

diff --git a/pandora/plat.c b/pandora/plat.c
index 7ba6c57..a24e3ba 100644 (file)
--- a/pandora/plat.c
+++ b/pandora/plat.c
@@ -32,13 +32,13 @@
 static struct vout_fbdev *main_fb, *layer_fb;\r
 static int g_layer_x, g_layer_y;\r
 static int g_layer_w = 320, g_layer_h = 240;\r
-static int g_osd_fps_x, g_osd_y;\r
+static int g_osd_fps_x, g_osd_y, doing_bg_frame;\r
 \r
 static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts";\r
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-static unsigned char __attribute__((aligned(4))) temp_frame[g_menuscreen_w * g_menuscreen_h * 2];\r
 static unsigned char __attribute__((aligned(4))) fb_copy[g_screen_width * g_screen_height * 2];\r
-unsigned char *PicoDraw2FB = temp_frame;\r
+static void *temp_frame;\r
+unsigned char *PicoDraw2FB;\r
 const char *renderer_names[] = { NULL };\r
 const char *renderer_names32x[] = { NULL };\r
 \r
@@ -207,20 +207,34 @@ void plat_update_volume(int has_changed, int is_up)
        }\r
 }\r
 \r
-static void make_bg(void)\r
+static void make_bg(int no_scale)\r
 {\r
        unsigned short *s = (void *)fb_copy;\r
-       unsigned int t, *d = (unsigned int *)g_menubg_src_ptr + 80 / 2;\r
        int x, y;\r
 \r
-       memset32(g_menubg_src_ptr, 0, 800 * 480 * 2 / 4);\r
-\r
-       for (y = 0; y < 240; y++, s += 320, d += 800*2/2) {\r
-               for (x = 0; x < 320; x++) {\r
-                       t = s[x];\r
-                       t |= t << 16;\r
-                       d[x] = d[x + 800 / 2] = t;\r
+       memset32(g_menubg_src_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2 / 4);\r
+\r
+       if (!no_scale && g_menuscreen_w >= 640 && g_menuscreen_h >= 480) {\r
+               unsigned int t, *d = g_menubg_src_ptr;\r
+               d += (g_menuscreen_h / 2 - 480 / 2) * g_menuscreen_w / 2;\r
+               d += (g_menuscreen_w / 2 - 640 / 2) / 2;\r
+               for (y = 0; y < 240; y++, s += 320, d += g_menuscreen_w*2/2) {\r
+                       for (x = 0; x < 320; x++) {\r
+                               t = s[x];\r
+                               t |= t << 16;\r
+                               d[x] = d[x + g_menuscreen_w / 2] = t;\r
+                       }\r
                }\r
+               return;\r
+       }\r
+\r
+       if (g_menuscreen_w >= 320 && g_menuscreen_h >= 240) {\r
+               unsigned short *d = g_menubg_src_ptr;\r
+               d += (g_menuscreen_h / 2 - 240 / 2) * g_menuscreen_w;\r
+               d += (g_menuscreen_w / 2 - 320 / 2);\r
+               for (y = 0; y < 240; y++, s += 320, d += g_menuscreen_w)\r
+                       memcpy(d, s, 320*2);\r
+               return;\r
        }\r
 }\r
 \r
@@ -236,14 +250,16 @@ void pemu_forced_frame(int no_scale, int do_emu)
 \r
        PicoDrawSetOutFormat(PDF_RGB555, 1);\r
        Pico.m.dirtyPal = 1;\r
+       doing_bg_frame = 1;\r
        if (do_emu)\r
                PicoFrame();\r
        else\r
                PicoFrameDrawOnly();\r
+       doing_bg_frame = 0;\r
 \r
        // making a copy because enabling the layer clears it's mem\r
        memcpy32((void *)fb_copy, g_screen_ptr, sizeof(fb_copy) / 4);\r
-       make_bg(); // FIXME: honour no_scale\r
+       make_bg(no_scale);\r
 \r
        PicoOpt = po_old;\r
 }\r
@@ -273,32 +289,24 @@ static void updateSound(int len)
 \r
 void pemu_sound_start(void)\r
 {\r
-       int target_fps = Pico.m.pal ? 50 : 60;\r
-\r
        PsndOut = NULL;\r
 \r
        if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
        {\r
-               int snd_excess_add, frame_samples;\r
                int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
 \r
                PsndRerate(Pico.m.frame_count ? 1 : 0);\r
 \r
-               frame_samples = PsndLen;\r
-               snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;\r
-               if (snd_excess_add != 0)\r
-                       frame_samples++;\r
-\r
                /*\r
-                * for 44k stereo, we do 1470 samples/frame\r
+                * for 44k stereo, we do 1470 samples/emu_frame\r
                 * OMAP driver does power of 2 buffers, so we need at least 4K buffer.\r
                 * The most we can lag is 1K samples, size of OMAP's McBSP FIFO,\r
                 * with 2K sample buffer we might sometimes lag more than that,\r
                 * thus causing underflows.\r
                 */\r
-               printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
-                       PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);\r
-               sndout_oss_start(PsndRate, frame_samples * 2, is_stereo);\r
+               printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\r
+                       PsndRate, PsndLen, is_stereo, Pico.m.pal);\r
+               sndout_oss_start(PsndRate, is_stereo, 2);\r
                //sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
                PicoWriteSound = updateSound;\r
                plat_update_volume(0, 0);\r
@@ -410,6 +418,9 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 {\r
        int fb_w = 320, fb_h = 240, fb_left = 0, fb_right = 0, fb_top = 0, fb_bottom = 0;\r
 \r
+       if (doing_bg_frame)\r
+               return;\r
+\r
        PicoDrawSetOutFormat(PDF_RGB555, 1);\r
        PicoDrawSetCallbacks(emuscan, NULL);\r
 \r
@@ -490,7 +501,7 @@ void pemu_loop_prep(void)
        }\r
 \r
        // make sure there is no junk left behind the layer\r
-       memset32(g_menuscreen_ptr, 0, 800 * 480 * 2 / 4);\r
+       memset32(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2 / 4);\r
        g_menuscreen_ptr = vout_fbdev_flip(main_fb);\r
 \r
        // emu_video_mode_change will call pnd_setup_layer()\r
@@ -596,10 +607,8 @@ void plat_init(void)
                exit(1);\r
        }\r
 \r
-       if (w != g_menuscreen_w || h != g_menuscreen_h) {\r
-               fprintf(stderr, "%dx%d not supported on %s\n", w, h, main_fb_name);\r
-               goto fail0;\r
-       }\r
+       g_menuscreen_w = w;\r
+       g_menuscreen_h = h;\r
        g_menuscreen_ptr = vout_fbdev_flip(main_fb);\r
 \r
        w = 320; h = 240;\r
@@ -615,8 +624,14 @@ void plat_init(void)
        }\r
        g_screen_ptr = vout_fbdev_flip(layer_fb);\r
 \r
+       temp_frame = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);\r
+       if (temp_frame == NULL) {\r
+               fprintf(stderr, "OOM\n");\r
+               goto fail1;\r
+       }\r
        g_menubg_ptr = temp_frame;\r
        g_menubg_src_ptr = temp_frame;\r
+       PicoDraw2FB = temp_frame;\r
 \r
        sndout_oss_init();\r
        pnd_menu_init();\r

diff --git a/pandora/port_config.h b/pandora/port_config.h
index 50bc723..fa485ea 100644 (file)
--- a/pandora/port_config.h
+++ b/pandora/port_config.h
@@ -10,8 +10,9 @@
 #define SCREEN_SIZE_FIXED 1\r
 #define SCREEN_WIDTH  320\r
 #define SCREEN_HEIGHT 240\r
-#define MSCREEN_WIDTH  800\r
-#define MSCREEN_HEIGHT 480\r
+#define MSCREEN_SIZE_FIXED 0\r
+#define MSCREEN_WIDTH  SCREEN_WIDTH\r
+#define MSCREEN_HEIGHT SCREEN_HEIGHT\r
 \r
 // draw2.c\r
 #define START_ROW  0 // which row of tiles to start rendering at?\r

diff --git a/psp/port_config.h b/psp/port_config.h
index d07c9f4..e60c2ea 100644 (file)
--- a/psp/port_config.h
+++ b/psp/port_config.h
@@ -11,6 +11,9 @@
 #define SCREEN_SIZE_FIXED 1\r
 #define SCREEN_WIDTH  512\r
 #define SCREEN_HEIGHT 272\r
+#define MSCREEN_SIZE_FIXED 1\r
+#define MSCREEN_WIDTH  SCREEN_WIDTH\r
+#define MSCREEN_HEIGHT SCREEN_HEIGHT\r
 \r
 // draw.c\r
 #define USE_BGR555 1\r

diff --git a/win32/port_config.h b/win32/port_config.h
index d6a09cc..faae904 100644 (file)
--- a/win32/port_config.h
+++ b/win32/port_config.h
@@ -12,6 +12,9 @@
 #define SCREEN_SIZE_FIXED 0
 #define SCREEN_WIDTH  320
 #define SCREEN_HEIGHT 240
+#define MSCREEN_SIZE_FIXED 0
+#define MSCREEN_WIDTH  SCREEN_WIDTH
+#define MSCREEN_HEIGHT SCREEN_HEIGHT
 
 // draw2.c
 #define START_ROW  0 // which row of tiles to start rendering at?