eliminate texrels, part 3

[picodrive.git] / platform / linux / emu.c

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 9e45fb1..5a97959 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -31,42 +31,9 @@ void pemu_validate_config(void)
 {\r
        extern int PicoOpt;\r
 //     PicoOpt &= ~POPT_EXT_FM;\r
+#ifndef __arm__\r
        PicoOpt &= ~POPT_EN_DRC;\r
-}\r
-\r
-// FIXME: dupes from GP2X, need cleanup\r
-static void (*osd_text)(int x, int y, const char *text);\r
-\r
-/*\r
-static void osd_text8(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+3) >> 2;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~3;\r
-               p = (int *) ((char *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = 0xe0e0e0e0;\r
-       }\r
-       emu_text_out8(x, y, text);\r
-}\r
-*/\r
-\r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+1) >> 1;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~1;\r
-               p = (int *) ((short *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = (*p >> 2) & 0x39e7;\r
-       }\r
-       emu_text_out16(x, y, text);\r
+#endif\r
 }\r
 \r
 static void draw_cd_leds(void)\r
@@ -103,8 +70,8 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 {\r
        if (currentConfig.renderer != RT_16BIT && !(PicoAHW & PAHW_32X)) {\r
                unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;\r
-               unsigned char *ps = PicoDraw2FB + 328*8 + 8;\r
-               unsigned short *pal = HighPal;\r
+               unsigned char *ps = Pico.est.Draw2FB + 328*8 + 8;\r
+               unsigned short *pal = Pico.est.HighPal;\r
                int i, x;\r
                if (Pico.m.dirtyPal)\r
                        PicoDrawUpdateHighPal();\r
@@ -115,9 +82,9 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 \r
        if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
                if (notice)\r
-                       osd_text(4, g_screen_height - 8, notice);\r
+                       emu_osd_text16(4, g_screen_height - 8, notice);\r
                if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
-                       osd_text(g_screen_width - 60, g_screen_height - 8, fps);\r
+                       emu_osd_text16(g_screen_width - 60, g_screen_height - 8, fps);\r
        }\r
        if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
                draw_cd_leds();\r
@@ -134,7 +101,7 @@ static void apply_renderer(void)
        case RT_8BIT_ACC:\r
                PicoOpt &= ~POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_8BIT, 0);\r
-               PicoDrawSetOutBuf(PicoDraw2FB + 8, 328);\r
+               PicoDrawSetOutBuf(Pico.est.Draw2FB + 8, 328);\r
                break;\r
        case RT_8BIT_FAST:\r
                PicoOpt |=  POPT_ALT_RENDERER;\r
@@ -215,7 +182,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 void pemu_loop_prep(void)\r
 {\r
        apply_renderer();\r
-       osd_text = osd_text16;\r
 }\r
 \r
 void pemu_loop_end(void)\r