-// (c) Copyright 2006-2009 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
+/*\r
+ * (c) Copyright 2006-2010 notaz, All rights reserved.\r
+ *\r
+ * For performance reasons 3 renderers are exported for both MD and 32x modes:\r
+ * - 16bpp line renderer\r
+ * - 8bpp line renderer (slightly faster)\r
+ * - 8bpp tile renderer\r
+ * In 32x mode:\r
+ * - 32x layer is overlayed on top of 16bpp one\r
+ * - line internal one done on PicoDraw2FB, then mixed with 32x\r
+ * - tile internal one done on PicoDraw2FB, then mixed with 32x\r
+ */\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];\r
unsigned char *PicoDraw2FB = PicoDraw2FB_;\r
static int osd_fps_x, osd_y;\r
+const char *renderer_names_[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
+const char *renderer_names32x_[] = { "accurate", "faster ", "fastest ", NULL };\r
+const char **renderer_names = renderer_names_;\r
+const char **renderer_names32x = renderer_names32x_;\r
+enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
\r
extern void *gp2x_screens[4];\r
\r
gp2x_soc_t soc;\r
\r
defaultConfig.CPUclock = default_cpu_clock;\r
+ defaultConfig.renderer32x = RT_8BIT_FAST;\r
\r
soc = soc_detect();\r
if (soc == SOCID_MMSP2)\r
currentConfig.CPUclock = default_cpu_clock;\r
}\r
\r
+static int get_renderer(void)\r
+{\r
+ if (PicoAHW & PAHW_32X)\r
+ return currentConfig.renderer32x;\r
+ else\r
+ return currentConfig.renderer;\r
+}\r
+\r
+static void change_renderer(int diff)\r
+{\r
+ int *r;\r
+ if (PicoAHW & PAHW_32X)\r
+ r = ¤tConfig.renderer32x;\r
+ else\r
+ r = ¤tConfig.renderer;\r
+ *r += diff;\r
+ if (*r >= RT_COUNT)\r
+ *r = 0;\r
+ else if (*r < 0)\r
+ *r = RT_COUNT - 1;\r
+}\r
+\r
+#define is_16bit_mode() \\r
+ (get_renderer() == RT_16BIT || (PicoAHW & PAHW_32X))\r
+\r
static void (*osd_text)(int x, int y, const char *text);\r
\r
static void osd_text8(int x, int y, const char *text)\r
scr_offs = pitch * 2 + 4;\r
}\r
\r
- if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {\r
+ if (!is_16bit_mode()) {\r
#define p(x) px[(x) >> 2]\r
// 8-bit modes\r
unsigned int *px = (unsigned int *)((char *)g_screen_ptr + scr_offs);\r
int x, y, pitch = 320;\r
\r
// only if pen enabled and for 16bit modes\r
- if (pico_inp_mode == 0 || (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))\r
+ if (pico_inp_mode == 0 || currentConfig.EmuOpt != RT_16BIT)\r
return;\r
\r
x = pico_pen_x + PICO_PEN_ADJUST_X;\r
p[pitch*2] ^= 0xffff;\r
}\r
\r
-static int EmuScanBegin16(unsigned int num)\r
-{\r
- DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num;\r
-\r
- return 0;\r
-}\r
-\r
-static int EmuScanBegin8(unsigned int num)\r
-{\r
- DrawLineDest = (unsigned char *) g_screen_ptr + g_screen_width * num;\r
-\r
- return 0;\r
-}\r
-\r
/* rot thing for Wiz */\r
static unsigned char __attribute__((aligned(4))) rot_buff[320*4*2];\r
\r
int emu_opt = currentConfig.EmuOpt;\r
int ret;\r
\r
- if (PicoOpt & POPT_ALT_RENDERER)\r
+ if (PicoAHW & PAHW_32X)\r
+ ; // nothing to do\r
+ else if (get_renderer() == RT_8BIT_FAST)\r
{\r
// 8bit fast renderer\r
if (Pico.m.dirtyPal) {\r
vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,\r
!(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
}\r
- else if (!(emu_opt & EOPT_16BPP))\r
+ else if (get_renderer() == RT_8BIT_ACC)\r
{\r
// 8bit accurate renderer\r
if (Pico.m.dirtyPal)\r
\r
void plat_video_flip(void)\r
{\r
+ int stride = g_screen_width;\r
gp2x_video_flip();\r
+\r
+ if (is_16bit_mode())\r
+ stride *= 2;\r
+ PicoDrawSetOutBuf(g_screen_ptr, stride);\r
}\r
\r
/* XXX */\r
\r
void plat_status_msg_clear(void)\r
{\r
- int is_8bit = (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP);\r
+ int is_8bit = !is_16bit_mode();\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
/* ugh.. */\r
int i, u, *p;\r
\r
static void vidResetMode(void)\r
{\r
+ int gp2x_mode = 16;\r
+ int renderer = get_renderer();\r
+\r
+ PicoScanBegin = NULL;\r
PicoScanEnd = NULL;\r
\r
- if (PicoOpt & POPT_ALT_RENDERER) {\r
- if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- gp2x_video_changemode(-8);\r
- vidcpyM2 = vidcpy_m2_rot;\r
- osd_text = osd_text8_rot;\r
- } else {\r
- gp2x_video_changemode(8);\r
- vidcpyM2 = vidcpy_m2;\r
- osd_text = osd_text8;\r
- }\r
- }\r
- else if (currentConfig.EmuOpt & EOPT_16BPP) {\r
- PicoDrawSetColorFormat(1);\r
+ switch (renderer) {\r
+ case RT_16BIT:\r
+ PicoOpt &= ~POPT_ALT_RENDERER;\r
+ PicoDrawSetOutFormat(PDF_RGB555, 0);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- gp2x_video_changemode(-16);\r
PicoScanBegin = EmuScanBegin16_rot;\r
PicoScanEnd = EmuScanEnd16_rot;\r
- osd_text = osd_text16_rot;\r
- } else {\r
- gp2x_video_changemode(16);\r
- PicoScanBegin = EmuScanBegin16;\r
- osd_text = osd_text16;\r
}\r
- }\r
- else {\r
- PicoDrawSetColorFormat(2);\r
+ break;\r
+ case RT_8BIT_ACC:\r
+ PicoOpt &= ~POPT_ALT_RENDERER;\r
+ PicoDrawSetOutFormat(PDF_8BIT, 0);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width);\r
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
- gp2x_video_changemode(-8);\r
PicoScanBegin = EmuScanBegin8_rot;\r
PicoScanEnd = EmuScanEnd8_rot;\r
- osd_text = osd_text8_rot;\r
- } else {\r
- gp2x_video_changemode(8);\r
- PicoScanBegin = EmuScanBegin8;\r
- osd_text = osd_text8;\r
}\r
+ gp2x_mode = 8;\r
+ break;\r
+ case RT_8BIT_FAST:\r
+ PicoOpt |= POPT_ALT_RENDERER;\r
+ PicoDrawSetOutFormat(PDF_NONE, 0);\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
+ vidcpyM2 = vidcpy_m2_rot;\r
+ else\r
+ vidcpyM2 = vidcpy_m2;\r
+ gp2x_mode = 8;\r
+ break;\r
}\r
\r
- if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {\r
+ if (is_16bit_mode())\r
+ osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
+ else\r
+ osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
+\r
+ if (PicoAHW & PAHW_32X) {\r
+ // rules change in 32X world\r
+ if (renderer != RT_16BIT) {\r
+ PicoDrawSetOutFormat(PDF_NONE, 0);\r
+ PicoScanBegin = NULL;\r
+ PicoScanEnd = NULL;\r
+ }\r
+ PicoScan32xBegin = NULL;\r
+ PicoScan32xEnd = NULL;\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+ PicoScan32xBegin = EmuScanBegin16_rot;\r
+ PicoScan32xEnd = EmuScanEnd16_rot;\r
+ }\r
+ // Wiz 16bit is an exception, uses line rendering due to rotation mess\r
+ if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ PicoDraw32xSetFrameMode(0, 0);\r
+ }\r
+ else {\r
+ PicoDraw32xSetFrameMode(1, (renderer == RT_16BIT) ? 1 : 0);\r
+ }\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ gp2x_mode = 16;\r
+ }\r
+\r
+ if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
+ gp2x_mode = -gp2x_mode;\r
+ gp2x_video_changemode(gp2x_mode);\r
+\r
+ if (!is_16bit_mode()) {\r
// setup pal for 8-bit modes\r
localPal[0xc0] = 0x0000c000; // MCD LEDs\r
localPal[0xd0] = 0x00c00000;\r
make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
}\r
\r
-void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu)\r
+void plat_video_toggle_renderer(int change, int is_menu_call)\r
{\r
- if (force_16bpp) {\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
- }\r
- /* alt, 16bpp, 8bpp */\r
- else if (PicoOpt & POPT_ALT_RENDERER) {\r
- PicoOpt &= ~POPT_ALT_RENDERER;\r
- if (is_next)\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
- } else if (!(currentConfig.EmuOpt & EOPT_16BPP)) {\r
- if (is_next)\r
- PicoOpt |= POPT_ALT_RENDERER;\r
- else\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
- } else {\r
- currentConfig.EmuOpt &= ~EOPT_16BPP;\r
- if (!is_next)\r
- PicoOpt |= POPT_ALT_RENDERER;\r
- }\r
+ change_renderer(change);\r
\r
- if (is_menu)\r
+ if (is_menu_call)\r
return;\r
\r
vidResetMode();\r
rendstatus_old = -1;\r
\r
- if (PicoOpt & POPT_ALT_RENDERER) {\r
- emu_status_msg(" 8bit fast renderer");\r
- } else if (currentConfig.EmuOpt & EOPT_16BPP) {\r
- emu_status_msg("16bit accurate renderer");\r
- } else {\r
- emu_status_msg(" 8bit accurate renderer");\r
- }\r
+ if (PicoAHW & PAHW_32X)\r
+ emu_status_msg(renderer_names32x[get_renderer()]);\r
+ else\r
+ emu_status_msg(renderer_names[get_renderer()]);\r
}\r
\r
#if 0 // TODO\r
void pemu_forced_frame(int opts)\r
{\r
int po_old = PicoOpt;\r
- int eo_old = currentConfig.EmuOpt;\r
\r
PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoOpt |= opts|POPT_ACC_SPRITES;\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
\r
- PicoDrawSetColorFormat(1);\r
- PicoScanBegin = EmuScanBegin16;\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ PicoDraw32xSetFrameMode(0, 0);\r
+ PicoScanBegin = NULL;\r
PicoScanEnd = NULL;\r
Pico.m.dirtyPal = 1;\r
PicoFrameDrawOnly();\r
\r
PicoOpt = po_old;\r
- currentConfig.EmuOpt = eo_old;\r
}\r
\r
void plat_debug_cat(char *str)\r
gp2x_video_RGB_setscaling(0, scalex, 240);\r
\r
// clear whole screen in all buffers\r
- if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))\r
+ if (!is_16bit_mode())\r
gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
else\r
gp2x_memset_all_buffers(0, 0, 320*240*2);\r
/* do one more frame for menu bg */\r
PicoOpt &= ~POPT_ALT_RENDERER;\r
PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
- currentConfig.EmuOpt |= EOPT_16BPP;\r
\r
- PicoScanBegin = EmuScanBegin16;\r
+ PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+ PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+ PicoDraw32xSetFrameMode(0, 0);\r
+ PicoScanBegin = NULL;\r
PicoScanEnd = NULL;\r
- PicoDrawSetColorFormat(1);\r
Pico.m.dirtyPal = 1;\r
PicoFrame();\r
\r
notaz.gp2x.de / libpicofe.git / blobdiff