FAMEC idle loops, PSP port sync, minor adjustments

[picodrive.git] / Pico / Draw.c

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 4012770..c076624 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -1466,58 +1466,66 @@ void PicoDrawSetColorFormat(int which)
 }\r
 \r
 /* debug and fun */\r
+#define GREEN1  0x0700\r
+#ifdef USE_BGR555\r
+ #define YELLOW1 0x071c\r
+ #define BLUE1   0xf000\r
+ #define RED1    0x001e\r
+#else\r
+ #define YELLOW1 0xe700\r
+ #define BLUE1   0x001e\r
+ #define RED1    0xf000\r
+#endif\r
+\r
 static void set16(unsigned short *p, unsigned short d, int cnt)\r
 {\r
   while (cnt-- > 0)\r
     *p++ = d;\r
 }\r
 \r
-void PicoDrawShowSpriteStats(unsigned short *screen)\r
+void PicoDrawShowSpriteStats(unsigned short *screen, int stride)\r
 {\r
   int lines, i, u, step;\r
   unsigned short *dest;\r
   unsigned char *p;\r
 \r
-  memset(screen, 0, 320*240*2);\r
   step = (320-4*4-1) / MAX_LINE_SPRITES;\r
   lines = 240;\r
   if (!Pico.m.pal || !(Pico.video.reg[1]&8))\r
-    lines = 224, screen += 320*8;\r
+    lines = 224, screen += stride*8;\r
 \r
   for (i = 0; i < lines; i++)\r
   {\r
-    dest = screen + 320*i;\r
+    dest = screen + stride*i;\r
     p = &HighLnSpr[i][0];\r
 \r
     // sprite graphs\r
     for (u = 0; u < (p[0] & 0x7f); u++) {\r
-      set16(dest, (p[3+u] & 0x80) ? 0xe700 : 0x0700, step);\r
+      set16(dest, (p[3+u] & 0x80) ? YELLOW1 : GREEN1, step);\r
       dest += step;\r
     }\r
 \r
     // flags\r
-    dest = screen + 320*i + 320-4*4;\r
-    if (p[1] & SPRL_HAVE_LO)     set16(dest+4*0, 0x0700, 4);\r
-    if (p[1] & SPRL_HAVE_HI)     set16(dest+4*1, 0xe700, 4);\r
-    if (p[1] & SPRL_MAY_HAVE_OP) set16(dest+4*2, 0x001e, 4);\r
-    if (p[1] & SPRL_LO_ABOVE_HI) set16(dest+4*3, 0xf000, 4);\r
+    dest = screen + stride*i + 320-4*4;\r
+    if (p[1] & SPRL_HAVE_LO)     set16(dest+4*0, GREEN1,  4);\r
+    if (p[1] & SPRL_HAVE_HI)     set16(dest+4*1, YELLOW1, 4);\r
+    if (p[1] & SPRL_MAY_HAVE_OP) set16(dest+4*2, BLUE1,   4);\r
+    if (p[1] & SPRL_LO_ABOVE_HI) set16(dest+4*3, RED1,    4);\r
   }\r
 \r
   // draw grid\r
   for (i = step*5; i <= 320-4*4-1; i += step*5) {\r
     for (u = 0; u < lines; u++)\r
-      screen[i + u*320] = 0x182;\r
+      screen[i + u*stride] = 0x182;\r
   }\r
 }\r
 \r
-void PicoDrawShowPalette(unsigned short *screen)\r
+void PicoDrawShowPalette(unsigned short *screen, int stride)\r
 {\r
   unsigned int *spal=(void *)Pico.cram;\r
   unsigned int *dpal=(void *)HighPal;\r
   int x, y, i;\r
 \r
-  memset(screen, 0, 320*240*2);\r
-\r
   for (i = 0x3f/2; i >= 0; i--)\r
 #ifdef USE_BGR555\r
     dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
@@ -1531,20 +1539,20 @@ void PicoDrawShowPalette(unsigned short *screen)
     HighPal[0x80|i] = (unsigned short)t;\r
   }\r
 \r
-  screen += 16*320+8;\r
+  screen += 16*stride+8;\r
   for (y = 0; y < 8*4; y++)\r
     for (x = 0; x < 8*16; x++)\r
-      screen[x + y*320] = HighPal[x/8 + (y/8)*16];\r
+      screen[x + y*stride] = HighPal[x/8 + (y/8)*16];\r
 \r
   screen += 160;\r
   for (y = 0; y < 8*4; y++)\r
     for (x = 0; x < 8*16; x++)\r
-      screen[x + y*320] = HighPal[(x/8 + (y/8)*16) | 0x40];\r
+      screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x40];\r
 \r
-  screen += 320*48;\r
+  screen += stride*48;\r
   for (y = 0; y < 8*4; y++)\r
     for (x = 0; x < 8*16; x++)\r
-      screen[x + y*320] = HighPal[(x/8 + (y/8)*16) | 0x80];\r
+      screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x80];\r
 \r
   Pico.m.dirtyPal = 1;\r
 }\r