line draw deferment implemented

[picodrive.git] / Pico / Draw.s

diff --git a/Pico/Draw.s b/Pico/Draw.s
index 94739b8..46be65f 100644 (file)
--- a/Pico/Draw.s
+++ b/Pico/Draw.s
@@ -11,7 +11,7 @@
 .extern Pico\r
 .extern PicoOpt\r
 .extern HighCol\r
-.extern Scanline\r
+.extern DrawScanline\r
 .extern HighSprZ\r
 .extern rendstatus\r
 .extern DrawLineDest\r
@@ -316,7 +316,7 @@ DrawLayer:
     ldreqb  r12, [r11, #2]\r
     ldrneb  r12, [r11, #4]\r
 \r
-    ldr     r2, =Scanline         @ trying to make good use of pipeline here\r
+    ldr     r2, =DrawScanline     @ trying to make good use of pipeline here\r
     ldr     lr, =(Pico+0x10000)   @ lr=Pico.vram\r
 \r
     moveq   r12, r12, lsl #10\r
@@ -330,7 +330,7 @@ DrawLayer:
     mov     r4, r8, lsr #8        @ pvid->reg[13]\r
     mov     r4, r4, lsl #10       @ htab=pvid->reg[13]<<9; (halfwords)\r
     tst     r7, #2\r
-    addne   r4, r4, r2, lsl #2    @ htab+=Scanline<<1; // Offset by line\r
+    addne   r4, r4, r2, lsl #2    @ htab+=DrawScanline<<1; // Offset by line\r
     tst     r7, #1\r
     biceq   r4, r4, #0x1f         @ htab&=~0xf; // Offset by tile\r
     add     r4, r4, r0, lsl #1    @ htab+=plane\r
@@ -513,7 +513,7 @@ DrawLayer:
     bic     r8, r8, #0x3fc00000\r
     orr     r8, r8, r5, lsl #25   @ r8=(xmask[31:25]|had_output[24]|tilex[21:0])\r
 \r
-    ldr     r4, =Scanline\r
+    ldr     r4, =DrawScanline\r
     orr     r5, r1, r10, lsl #24\r
     ldr     r4, [r4]\r
     sub     r1, r3, #1\r
@@ -690,7 +690,7 @@ DrawLayer:
     movne   r7, r7, lsl #5\r
 \r
     @ Find the line in the name table\r
-    add     r2, r7, r2, lsl #22    @ r2=(vscroll+(Scanline<<1))<<21 (11 bits);\r
+    add     r2, r7, r2, lsl #22    @ r2=(vscroll+(DrawScanline<<1))<<21 (11 bits);\r
     orr     r1, r1, #0x80000000\r
     and     r2, r2, r1, ror #10    @ &((ymask<<1)|1)<<21;\r
     mov     r2, r2, lsr #21\r
@@ -1097,7 +1097,7 @@ DrawSprite:
 \r
     orr     r8, r2, r1, lsl #4\r
     ldr     r3, [r0]        @ sprite[0]\r
-    ldr     r7, =Scanline\r
+    ldr     r7, =DrawScanline\r
     mov     r6, r3, lsr #28\r
     sub     r6, r6, #1      @ r6=width-1 (inc later)\r
     mov     r5, r3, lsr #24\r
@@ -1107,7 +1107,7 @@ DrawSprite:
 \r
     ldr     r7, [r7]\r
     ldr     r9, [r0, #4]\r
-    sub     r7, r7, r4, asr #16 @ r7=row=Scanline-sy\r
+    sub     r7, r7, r4, asr #16 @ r7=row=DrawScanline-sy\r
 \r
     mov     r2, r9, asr #16 @ r2=sx\r
     mov     r9, r9, lsl #16\r
@@ -1266,7 +1266,7 @@ DrawWindow:
     stmfd   sp!, {r4-r11,lr}\r
 \r
     ldr     r11, =(Pico+0x22228)  @ Pico.video\r
-    ldr     r10, =Scanline\r
+    ldr     r10, =DrawScanline\r
     ldrb    r12, [r11, #3]        @ pvid->reg[3]\r
 \r
     ldr     r10, [r10]\r