don't draw layer where window is (for World Championship Soccer II)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@243 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Draw.c b/Pico/Draw.c
index dec7abd..9d7e9bc 100644 (file)
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -48,7 +48,7 @@ void BackFill(int reg7, int sh);
 void DrawSprite(int *sprite, int **hc, int sh);\r
 void DrawTilesFromCache(int *hc, int sh, int rlim);\r
 void DrawSpritesFromCache(int *hc, int sh);\r
-void DrawLayer(int plane, int *hcache, int maxcells, int sh);\r
+void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
 void FinalizeLineBGR444(int sh);\r
 void FinalizeLineRGB555(int sh);\r
 void blockcpy_or(void *dst, void *src, size_t n, int pat);\r
@@ -271,20 +271,22 @@ static int TileFlipZSH(int sx,int addr,int pal,int zval)
 // --------------------------------------------\r
 \r
 #ifndef _ASM_DRAW_C\r
-static void DrawStrip(struct TileStrip *ts, int sh)\r
+static void DrawStrip(struct TileStrip *ts, int plane_sh, int cellskip)\r
 {\r
-  int tilex=0,dx=0,ty=0,code=0,addr=0,cells;\r
+  int tilex,dx,ty,code=0,addr=0,cells;\r
   int oldcode=-1,blank=-1; // The tile we know is blank\r
-  int pal=0;\r
+  int pal=0,sh;\r
 \r
   // Draw tiles across screen:\r
-  tilex=(-ts->hscroll)>>3;\r
+  sh=(plane_sh<<5)&0x40;\r
+  tilex=((-ts->hscroll)>>3)+cellskip;\r
   ty=(ts->line&7)<<1; // Y-Offset into tile\r
   dx=((ts->hscroll-1)&7)+1;\r
-  cells = ts->cells;\r
+  cells = ts->cells - cellskip;\r
   if(dx != 8) cells++; // have hscroll, need to draw 1 cell more\r
+  dx+=cellskip<<3;\r
 \r
-  for (; cells; dx+=8,tilex++,cells--)\r
+  for (; cells > 0; dx+=8,tilex++,cells--)\r
   {\r
     int zero=0;\r
 \r
@@ -304,8 +306,7 @@ static void DrawStrip(struct TileStrip *ts, int sh)
       addr+=ty;\r
       if (code&0x1000) addr^=0xe; // Y-flip\r
 \r
-//      pal=Pico.cram+((code>>9)&0x30);\r
-      pal=((code>>9)&0x30)|(sh<<6);\r
+      pal=((code>>9)&0x30)|sh;\r
     }\r
 \r
     if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
@@ -321,34 +322,28 @@ static void DrawStrip(struct TileStrip *ts, int sh)
 }\r
 \r
 // this is messy\r
-void DrawStripVSRam(struct TileStrip *ts, int plane)\r
+void DrawStripVSRam(struct TileStrip *ts, int plane_sh, int cellskip)\r
 {\r
-  int tilex=0,dx=0,ty=0,code=0,addr=0,cell=0,nametabadd=0;\r
+  int tilex,dx,code=0,addr=0,cell=0;\r
   int oldcode=-1,blank=-1; // The tile we know is blank\r
   int pal=0,scan=Scanline;\r
 \r
   // Draw tiles across screen:\r
   tilex=(-ts->hscroll)>>3;\r
   dx=((ts->hscroll-1)&7)+1;\r
-  if(dx != 8) {\r
-    int vscroll, line;\r
-    cell--; // have hscroll, start with negative cell\r
-    // also calculate intial VS stuff\r
-    vscroll=Pico.vsram[plane];\r
-\r
-    // Find the line in the name table\r
-    line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..\r
-    nametabadd=(line>>3)<<(ts->line>>24);    // .. and shift[width]\r
-    ty=(line&7)<<1; // Y-Offset into tile\r
-  }\r
+  if(dx != 8) cell--; // have hscroll, start with negative cell\r
+  cell+=cellskip;\r
+  tilex+=cellskip;\r
+  dx+=cellskip<<3;\r
 \r
   for (; cell < ts->cells; dx+=8,tilex++,cell++)\r
   {\r
-    int zero=0;\r
+    int zero=0,nametabadd,ty;\r
 \r
-    if((cell&1)==0) {\r
+    //if((cell&1)==0)\r
+    {\r
       int line,vscroll;\r
-      vscroll=Pico.vsram[plane+(cell&~1)];\r
+      vscroll=Pico.vsram[(plane_sh&1)+(cell&~1)];\r
 \r
       // Find the line in the name table\r
       line=(vscroll+scan)&ts->line&0xffff; // ts->line is really ymask ..\r
@@ -371,8 +366,7 @@ void DrawStripVSRam(struct TileStrip *ts, int plane)
       addr=(code&0x7ff)<<4;\r
       if (code&0x1000) addr+=14-ty; else addr+=ty; // Y-flip\r
 \r
-//      pal=Pico.cram+((code>>9)&0x30);\r
-      pal=((code>>9)&0x30);\r
+      pal=((code>>9)&0x30)|((plane_sh<<5)&0x40);\r
     }\r
 \r
     if (code&0x0800) zero=TileFlip(dx,addr,pal);\r
@@ -440,7 +434,7 @@ void DrawStripInterlace(struct TileStrip *ts)
 // --------------------------------------------\r
 \r
 #ifndef _ASM_DRAW_C\r
-static void DrawLayer(int plane, int *hcache, int maxcells, int sh)\r
+static void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells)\r
 {\r
   struct PicoVideo *pvid=&Pico.video;\r
   const char shift[4]={5,6,5,7}; // 32,64 or 128 sized tilemaps (2 is invalid)\r
@@ -463,20 +457,20 @@ static void DrawLayer(int plane, int *hcache, int maxcells, int sh)
   else if(width>1) ymask =0x0ff;\r
 \r
   // Find name table:\r
-  if (plane==0) ts.nametab=(pvid->reg[2]&0x38)<< 9; // A\r
-  else          ts.nametab=(pvid->reg[4]&0x07)<<12; // B\r
+  if (plane_sh&1) ts.nametab=(pvid->reg[4]&0x07)<<12; // B\r
+  else            ts.nametab=(pvid->reg[2]&0x38)<< 9; // A\r
 \r
   htab=pvid->reg[13]<<9; // Horizontal scroll table address\r
   if ( pvid->reg[11]&2)     htab+=Scanline<<1; // Offset by line\r
   if ((pvid->reg[11]&1)==0) htab&=~0xf; // Offset by tile\r
-  htab+=plane; // A or B\r
+  htab+=plane_sh&1; // A or B\r
 \r
   // Get horizontal scroll value, will be masked later\r
   ts.hscroll=Pico.vram[htab&0x7fff];\r
 \r
   if((pvid->reg[12]&6) == 6) {\r
     // interlace mode 2\r
-    vscroll=Pico.vsram[plane]; // Get vertical scroll value\r
+    vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
 \r
     // Find the line in the name table\r
     ts.line=(vscroll+(Scanline<<1))&((ymask<<1)|1);\r
@@ -487,15 +481,15 @@ static void DrawLayer(int plane, int *hcache, int maxcells, int sh)
     // shit, we have 2-cell column based vscroll\r
     // luckily this doesn't happen too often\r
     ts.line=ymask|(shift[width]<<24); // save some stuff instead of line\r
-    DrawStripVSRam(&ts, plane);\r
+    DrawStripVSRam(&ts, plane_sh, cellskip);\r
   } else {\r
-    vscroll=Pico.vsram[plane]; // Get vertical scroll value\r
+    vscroll=Pico.vsram[plane_sh&1]; // Get vertical scroll value\r
 \r
     // Find the line in the name table\r
     ts.line=(vscroll+Scanline)&ymask;\r
     ts.nametab+=(ts.line>>3)<<shift[width];\r
 \r
-    DrawStrip(&ts, sh);\r
+    DrawStrip(&ts, plane_sh, cellskip);\r
   }\r
 }\r
 \r
@@ -1297,22 +1291,22 @@ static int DrawDisplay(int sh)
     }\r
   }\r
 \r
-  DrawLayer(1, HighCacheB, maxcells, sh);\r
+  DrawLayer(1|(sh<<1), HighCacheB, 0, maxcells);\r
   if (hvwind == 1)\r
-    DrawWindow(0, maxcells>>1, 0, sh); // HighCacheAW\r
+    DrawWindow(0, maxcells>>1, 0, sh);\r
   else if (hvwind == 2) {\r
     // ahh, we have vertical window\r
-    DrawLayer(0, HighCacheA, (win&0x80) ? edge<<1 : maxcells, sh);\r
-    DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 0, sh); // HighCacheW\r
+    DrawLayer(0|(sh<<1), HighCacheA, (win&0x80) ?    0 : edge<<1, (win&0x80) ?     edge<<1 : maxcells);\r
+    DrawWindow(                      (win&0x80) ? edge :       0, (win&0x80) ? maxcells>>1 : edge, 0, sh);\r
   } else\r
-    DrawLayer(0, HighCacheA, maxcells, sh);\r
+    DrawLayer(0|(sh<<1), HighCacheA, 0, maxcells);\r
   DrawAllSprites(HighCacheS, maxw, 0, sh);\r
 \r
   if (HighCacheB[0]) DrawTilesFromCache(HighCacheB, sh, 328);\r
   if (hvwind == 1)\r
     DrawWindow(0, maxcells>>1, 1, sh);\r
   else if (hvwind == 2) {\r
-    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 0);\r
+    if(HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, (win&0x80) ? edge<<4 : 328);\r
     DrawWindow((win&0x80) ? edge : 0, (win&0x80) ? maxcells>>1 : edge, 1, sh);\r
   } else\r
     if (HighCacheA[0]) DrawTilesFromCache(HighCacheA, sh, 328);\r

diff --git a/Pico/Draw.s b/Pico/Draw.s
index 5032f15..e31ba0b 100644 (file)
--- a/Pico/Draw.s
+++ b/Pico/Draw.s
@@ -211,9 +211,9 @@
 @   int cells;   // 0x14\r
 @ };\r
 \r
-@ int DrawLayer(int plane, int *hcache, int maxcells, int sh)\r
+@ void DrawLayer(int plane_sh, int *hcache, int cellskip, int maxcells);\r
 \r
-.global DrawLayer @ int plane, int *hcache, int maxcells, int sh\r
+.global DrawLayer\r
 \r
 DrawLayer:\r
     stmfd   sp!, {r4-r11,lr}\r
@@ -221,10 +221,11 @@ DrawLayer:
     ldr     r11, =(Pico+0x22228)  @ Pico.video\r
     mov     r8, #1\r
 \r
-    ldrb    r7, [r11, #16]        @ ??hh??ww\r
+    ldrb    r7, [r11, #16]        @ ??vv??hh\r
 \r
     mov     r6, r1                @ hcache\r
-    orr     r9, r2, r3, lsl #31   @ r9=maxcells|(sh<<31)\r
+    orr     r9, r3, r0, lsl #30\r
+    orr     r9, r9, r2, lsl #8    @ r9=sh[31]|cellskip[15:8]|maxcells[7:0]  (tmp)\r
 \r
     mov     r1, r7, lsl #4\r
     orr     r1, r1, #0x00ff\r
@@ -244,7 +245,7 @@ DrawLayer:
     sub     r5, r5, #1            @ r5=xmask\r
 \r
     @ Find name table:\r
-    tst     r0,  r0\r
+    ands    r0,  r0, #1\r
     ldreqb  r12, [r11, #2]\r
     ldrneb  r12, [r11, #4]\r
 \r
@@ -309,11 +310,15 @@ DrawLayer:
     orrne   r10,r10, #1<<23 @ r10=(cells<<24|sh<<23|hi_not_empty<<22|had_output<<21|ty)\r
     movne   r3, #0x40       @ default to shadowed pal on sh mode\r
 \r
-    mvn     r9, #0          @ r9=prevcode=-1\r
-\r
     cmp     r7, #8\r
     addne   r10,r10, #0x01000000 @ we will loop cells+1 times if there is scroll\r
 \r
+    and     r9, r9, #0xff00\r
+    add     r8, r8, r9, lsr #8   @ tilex+=cellskip\r
+    add     r7, r7, r9, lsr #5   @ dx+=cellskip<<3;\r
+    sub     r10,r10,r9, lsl #16  @ cells-=cellskip\r
+    mvn     r9, #0               @ r9=prevcode=-1\r
+\r
     @ cache some stuff to avoid mem access\r
     ldr     r11,=HighCol\r
     mov     r0, #0xf\r
@@ -432,7 +437,7 @@ DrawLayer:
     rsb     r8, r3, #0\r
     mov     r8, r8, lsr #3        @ r8=tilex=(-ts->hscroll)>>3\r
     bic     r8, r8, #0xff000000\r
-    orr     r8, r8, r5, lsl #25   @ r8=(xmask[31:25]|had_output[24]|tilex[15:0])\r
+    orr     r8, r8, r5, lsl #25   @ r8=(xmask[31:25]|had_output[24]|tilex[23:0])\r
 \r
     ldr     r4, =Scanline\r
     orr     r5, r1, r10, lsl #24\r
@@ -443,24 +448,28 @@ DrawLayer:
     add     r7, r1, #1            @ r7=dx=((ts->hscroll-1)&7)+1\r
 \r
     mov     r10,r9, lsl #16\r
-    tst     r0, r0\r
+    tst     r0, #1\r
     orrne   r10,r10, #0x8000\r
     tst     r9, #1<<31\r
     mov     r3, #0\r
     orr     r10,r10, #0xff000000 @ will be adjusted on entering loop\r
-    orrne   r10,r10, #1<<23 @ r10=(cells[31:24]|sh[23]|hi_not_empty[22]|cells_max[21:16]|plane[15]|ty[14:0])\r
+    orrne   r10,r10, #1<<23 @ r10=(cell[31:24]|sh[23]|hi_not_empty[22]|cells_max[21:16]|plane[15]|ty[14:0])\r
     movne   r3, #0x40       @ default to shadowed pal on sh mode\r
 \r
-    mvn     r9, #0          @ r9=prevcode=-1\r
+    cmp     r7, #8\r
+    subne   r10,r10, #0x01000000 @ have hscroll, start with negative cell\r
+\r
+    and     r9, r9, #0xff00\r
+    add     r8, r8, r9, lsr #8   @ tilex+=cellskip\r
+    add     r7, r7, r9, lsr #5   @ dx+=cellskip<<3;\r
+    add     r10,r10,r9, lsl #16  @ cell+=cellskip\r
+    mvn     r9, #0               @ r9=prevcode=-1\r
 \r
     @ cache some stuff to avoid mem access\r
     ldr     r11,=HighCol\r
     mov     r0, #0xf\r
     add     r1, r11, r7         @ r1=pdest\r
 \r
-    cmp     r7, #8\r
-    subne   r10,r10, #0x01000000 @ have hscroll, start with negative cell\r
-\r
 \r
     @ r4 & r7 are scratch in this loop\r
 .dsloop_vs_subr1:\r