beginnings for Pandora support

[picodrive.git] / Pico / Draw.c

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 4012770..8635d79 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -36,7 +36,6 @@ static int  HighCacheA[41+1];   // caches for high layers
 static int  HighCacheB[41+1];\r
 int  HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
 \r
-#define MAX_LINE_SPRITES 29\r
 #define SPRL_HAVE_HI     0x80 // have hi priority sprites\r
 #define SPRL_HAVE_LO     0x40 // *lo*\r
 #define SPRL_MAY_HAVE_OP 0x20 // may have operator sprites on the line\r
@@ -958,7 +957,7 @@ void PrepareSprites(int full)
   {\r
     int pack;\r
     // updates: tilecode, sx\r
-    for (u=0; u < max_lines && (pack = *pd); u++, pd+=2)\r
+    for (u=0; u < max_sprites && (pack = *pd); u++, pd+=2)\r
     {\r
       unsigned int *sprite;\r
       int code2, sx, sy, height;\r
@@ -1010,7 +1009,7 @@ found:;
     for (u = 0; u < max_lines; u++)\r
       *((int *)&HighLnSpr[u][0]) = 0;\r
 \r
-    for (u = 0; u < max_lines; u++)\r
+    for (u = 0; u < max_sprites; u++)\r
     {\r
       unsigned int *sprite;\r
       int code, code2, sx, sy, hv, height, width;\r
@@ -1465,87 +1464,3 @@ void PicoDrawSetColorFormat(int which)
 #endif\r
 }\r
 \r
-/* debug and fun */\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
-{\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
-\r
-  for (i = 0; i < lines; i++)\r
-  {\r
-    dest = screen + 320*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
-      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
-  }\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
-  }\r
-}\r
-\r
-void PicoDrawShowPalette(unsigned short *screen)\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
-#else\r
-    dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
-#endif\r
-  for (i = 0x3f; i >= 0; i--)\r
-    HighPal[0x40|i] = (unsigned short)((HighPal[i]>>1)&0x738e);\r
-  for (i = 0x3f; i >= 0; i--) {\r
-    int t=HighPal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
-    HighPal[0x80|i] = (unsigned short)t;\r
-  }\r
-\r
-  screen += 16*320+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
-\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
-\r
-  screen += 320*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
-\r
-  Pico.m.dirtyPal = 1;\r
-}\r
-\r