#include "../libpicofe/plat.h"\r
#include "../common/emu.h"\r
#include "../common/arm_utils.h"\r
-#include "version.h"\r
+#include "../common/version.h"\r
\r
#include <pico/pico_int.h>\r
\r
{\r
extern int PicoOpt;\r
// PicoOpt &= ~POPT_EXT_FM;\r
- PicoOpt &= ~POPT_EN_SVP_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
+#ifndef __arm__\r
+ PicoOpt &= ~POPT_EN_DRC;\r
+#endif\r
}\r
\r
static void draw_cd_leds(void)\r
\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
break;\r
}\r
\r
- if (PicoAHW & PAHW_32X) {\r
- int only_32x = 0;\r
- if (currentConfig.renderer == RT_16BIT)\r
- only_32x = 1;\r
- else\r
- PicoDrawSetOutFormat(PDF_NONE, 0);\r
- PicoDraw32xSetFrameMode(1, only_32x);\r
+ if (PicoAHW & PAHW_32X)\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- }\r
- //PicoDraw32xSetFrameMode(0, 0);\r
- //PicoDrawSetOutFormat(PDF_RGB555, 1);\r
}\r
\r
void plat_video_toggle_renderer(int change, int is_menu)\r
void pemu_forced_frame(int no_scale, int do_emu)\r
{\r
PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
- PicoDraw32xSetFrameMode(0, 0);\r
PicoDrawSetCallbacks(NULL, NULL);\r
Pico.m.dirtyPal = 1;\r
\r
void pemu_loop_prep(void)\r
{\r
apply_renderer();\r
- osd_text = osd_text16;\r
}\r
\r
void pemu_loop_end(void)\r