* - 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
+ * - line internal one done on .Draw2FB, then mixed with 32x\r
+ * - tile internal one done on .Draw2FB, then mixed with 32x\r
*/\r
\r
#include <stdio.h>\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
#include <pico/sound/mix.h>\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
\r
#ifdef BENCHMARK\r
#define OSD_FPS_X 220\r
\r
static int EmuScanBegin16_rot(unsigned int num)\r
{\r
- DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
+ Pico.est.DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
return 0;\r
}\r
\r
\r
static int EmuScanBegin8_rot(unsigned int num)\r
{\r
- DrawLineDest = rot_buff + (num & 3) * 320;\r
+ Pico.est.DrawLineDest = rot_buff + (num & 3) * 320;\r
return 0;\r
}\r
\r
if (emu_scan_begin)\r
return emu_scan_begin(ld_counter);\r
else\r
- DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;\r
+ Pico.est.DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;\r
\r
return 0;\r
}\r
\r
static int EmuScanEnd16_ld(unsigned int num)\r
{\r
- void *oldline = DrawLineDest;\r
+ void *oldline = Pico.est.DrawLineDest;\r
\r
if (emu_scan_end)\r
emu_scan_end(ld_counter);\r
ld_left = ld_lines;\r
\r
EmuScanBegin16_ld(num);\r
- memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);\r
+ memcpy(Pico.est.DrawLineDest, oldline, 320 * gp2x_current_bpp / 8);\r
if (emu_scan_end)\r
emu_scan_end(ld_counter);\r
\r
pallen = 0x100;\r
}\r
else if (Pico.est.rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
- bgr444_to_rgb32(localPal+0x40, HighPal);\r
- bgr444_to_rgb32(localPal+0x80, HighPal+0x40);\r
+ bgr444_to_rgb32(localPal+0x40, Pico.est.HighPal);\r
+ bgr444_to_rgb32(localPal+0x80, Pico.est.HighPal+0x40);\r
}\r
else\r
- memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
+ memcpy(localPal + 0x80, localPal, 0x40 * 4); // for spr prio mess\r
\r
return pallen;\r
}\r
}\r
// a hack for VR\r
if (PicoAHW & PAHW_SVP)\r
- memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
+ memset32((int *)(Pico.est.Draw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
// do actual copy\r
- vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,\r
+ vidcpyM2(g_screen_ptr, Pico.est.Draw2FB+328*8,\r
!(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
}\r
else if (get_renderer() == RT_8BIT_ACC)\r