X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fblitter.cpp;h=046177106a2235b25eb28bd5e8fdc91b54652c12;hb=7ac2f54164f3ba411ea8a8a528e104b3187249e7;hp=34c4aaac81d8ad479372d10a1b2ceae6d2307040;hpb=21010310cfb50e9bd58f55ebecbf26b990c785bd;p=virtualjaguar diff --git a/src/blitter.cpp b/src/blitter.cpp index 34c4aaa..0461771 100644 --- a/src/blitter.cpp +++ b/src/blitter.cpp @@ -2646,7 +2646,8 @@ void DATA(uint64 &wdata, uint8 &dcomp, uint8 &zcomp, bool &nowrite, bool big_pix, bool cmpdst, uint8 daddasel, uint8 daddbsel, uint8 daddmode, bool daddq_sel, uint8 data_sel, uint8 dbinh, uint8 dend, uint8 dstart, uint64 dstd, uint32 iinc, uint8 lfu_func, uint64 &patd, bool patdadd, bool phrase_mode, uint64 srcd, bool srcdread, bool srczread, bool srcz2add, uint8 zmode, - bool bcompen, bool bkgwren, bool dcompen, uint8 icount, uint8 pixsize); + bool bcompen, bool bkgwren, bool dcompen, uint8 icount, uint8 pixsize, + uint64 &srcz, uint64 dstz, uint32 zinc); void COMP_CTRL(uint8 &dbinh, bool &nowrite, bool bcompen, bool big_pix, bool bkgwren, uint8 dcomp, bool dcompen, uint8 icount, uint8 pixsize, bool phrase_mode, uint8 srcd, uint8 zcomp); @@ -2662,9 +2663,6 @@ void BlitterMidsummer2(void) uint32 cmd = GET32(blitter_ram, COMMAND); -// $01800005 has SRCENX, may have to investigate further... -// $00011008 has GOURD & DSTEN. -// $41802F41 has SRCSHADE, CLIPA1 /*logBlit = false; if ( cmd != 0x00010200 && // PATDSEL @@ -2692,6 +2690,10 @@ if ( && cmd != 0x00010000 // PATDSEL //Hover Strike text: && cmd != 0x1401060C // SRCENX DSTEN UPDA1 UPDA2 PATDSEL BCOMPEN BKGWREN +//Hover Strike 3D stuff +// && cmd != 0x01902839 // SRCEN DSTEN DSTENZ DSTWRZ DSTA2 GOURZ ZMODE=4 LFUFUNC=C +//Hover Strike darkening on intro to play (briefing) screen + && cmd != 0x00020208 // DSTEN UPDA1 ADDDSEL //Trevor McFur stuff: && cmd != 0x05810601 // SRCEN UPDA1 UPDA2 PATDSEL BCOMPEN && cmd != 0x01800201 // SRCEN UPDA1 LFUFUNC=C @@ -2700,6 +2702,7 @@ if ( && cmd != 0x00011040 // CLIP_A1 GOURD PATDSEL ) logBlit = true;//*/ +logBlit = true; if (blit_start_log == 0) // Wait for the signal... logBlit = false;//*/ /* @@ -2709,6 +2712,17 @@ logBlit = F, cmd = 00011000 logBlit = F, cmd = 00011040 logBlit = F, cmd = 01800005 * logBlit = F, cmd = 09800741 * + +Hover Strike mission selection screen: +Blit! (CMD = 01902839) // SRCEN DSTEN DSTENZ DSTWRZ DSTA2 GOURZ ZMODE=4 LFUFUNC=C + +Checkered Flag blits in the screw up zone: +Blit! (CMD = 01800001) // SRCEN LFUFUNC=C +Blit! (CMD = 01800000) // LFUFUNC=C +Blit! (CMD = 00010000) // PATDSEL + +Wolfenstein 3D in the fuckup zone: +Blit! (CMD = 01800000) // LFUFUNC=C */ //printf("logBlit = %s, cmd = %08X\n", (logBlit ? "T" : "F"), cmd); @@ -3020,7 +3034,9 @@ fflush(stdout); #endif idlei = true; - return; +//Instead of a return, let's try breaking out of the loop... +break; +// return; } else idlei = false; @@ -3376,7 +3392,7 @@ sshftld = idle_inner; bool dsta_addi = (dwritei && !dstwrz) || dzwritei; bool gensrc = sreadxi || szreadxi || sreadi || szreadi; - bool gendst = dreadi || szreadi || dwritei || dzwritei; + bool gendst = dreadi || dzreadi || dwritei || dzwritei; bool gena2i = (gensrc && !dsta2) || (gendst && dsta2); bool zaddr = szreadx || szread || dzread || dzwrite; @@ -3718,6 +3734,39 @@ uint8 shfti = (srcen || pobbsel ? (sshftld ? loshd : srcshift & 0x07) : 0); shfti |= (srcen && phrase_mode ? (sshftld ? shftv & 0x38 : srcshift & 0x38) : 0); srcshift = shfti; +/* +Note that there's a problem here--even though it's NOT in phrase mode, it's still calculating +a source shift... !!! FIX !!! +Actually, the problem is the code that utilizes the source shift even when it's not needed... I think. + +Blit! (CMD = 01800609) +Flags: SRCEN DSTEN UPDA1 UPDA2 LFUFUNC=C + count = 10 x 12 + a1_base = 001F8300, a2_base = 00812F80 + a1_x = 0007, a1_y = 0000, a1_frac_x = 0000, a1_frac_y = 0000, a2_x = 0000, a2_y = 0000 + a1_step_x = FFF6, a1_step_y = 0001, a1_stepf_x = 0000, a1_stepf_y = 0000, a2_step_x = FFF6, a2_step_y = 0001 + a1_inc_x = 0000, a1_inc_y = 0000, a1_incf_x = 0000, a1_incf_y = 0000 + a1_win_x = 0000, a1_win_y = 0000, a2_mask_x = 0000, a2_mask_y = 0000 + a2_mask=F a1add=+1/+0 a2add=+1/+0 + a1_pixsize = 2, a2_pixsize = 2 + srcd=0000000000000000 dstd=0000000000000000 patd=0000000000000000 iinc=00000000 + srcz1=0000000000000000 srcz2=0000000000000000 dstz=0000000000000000 zinc=00000000, coll=0 + Phrase mode is off + [in=T a1f=F a1=F zf=F z=F a2=F iif=F iii=F izf=F izi=F] + Entering INNER state... + Entering SREAD state... Source read address/pix address: 00812F80/0 [0000000000000000] + Entering A2_ADD state [a2_x=0000, a2_y=0000, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... + Entering DREAD state... Dest read address/pix address: 001F8303/4 [0000000000000000] + Entering DWRITE state... Dest write address/pix address: 001F8303/4 srcz=0000000000000000] + +[dcomp=FF zcomp=00 dbinh=00] + +[srcz=0000000000000000 dstz=0000000000000000 zwdata=0000000000000000 mask=000F] + [0000000000000000] (icount=0009, inc=1) + [dstart=4 dend=8 pwidth=4 srcshift=4][daas=0 dabs=0 dam=7 ds=1 daq=F] + Entering A1_ADD state [a1_x=0007, a1_y=0000, addasel=0, addbsel=0, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... + +*/ if (sreadx) { #ifdef VERBOSE_BLITTER_LOGGING @@ -3732,18 +3781,26 @@ fflush(stdout); //ADDRGEN(srcAddr, pixAddr, gena2i, zaddr, // a1_x, a1_y, a1_base, a1_pitch, a1_pixsize, a1_width, a1_zoffset, // a2_x, a2_y, a2_base, a2_pitch, a2_pixsize, a2_width, a2_zoffset); -srcd2 = srcd1; -srcd1 = ((uint64)JaguarReadLong(address, BLITTER) << 32) | (uint64)JaguarReadLong(address + 4, BLITTER); + srcd2 = srcd1; + srcd1 = ((uint64)JaguarReadLong(address + 0, BLITTER) << 32) + | (uint64)JaguarReadLong(address + 4, BLITTER); //Kludge to take pixel size into account... +//Hmm. If we're not in phrase mode, this is most likely NOT going to be used... +//Actually, it would be--because of BCOMPEN expansion, for example... if (!phrase_mode) { - if (pixsize == 5) - srcd1 >>= 32; - else if (pixsize == 4) - srcd1 >>= 48; - else + if (bcompen) srcd1 >>= 56; -} + else + { + if (pixsize == 5) + srcd1 >>= 32; + else if (pixsize == 4) + srcd1 >>= 48; + else + srcd1 >>= 56; + } +}//*/ #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { @@ -3759,9 +3816,19 @@ fflush(stdout); #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Entering SZREADX state...\n"); +printf(" Entering SZREADX state..."); fflush(stdout); } +#endif + srcz2 = srcz1; + srcz1 = ((uint64)JaguarReadLong(address, BLITTER) << 32) | (uint64)JaguarReadLong(address + 4, BLITTER); +#ifdef VERBOSE_BLITTER_LOGGING +if (logBlit) +{ + printf(" Src Z extra read address/pix address: %08X/%1X [%08X%08X]\n", address, pixAddr, + (uint32)(dstz >> 32), (uint32)(dstz & 0xFFFFFFFF)); + fflush(stdout); +} #endif } @@ -3799,7 +3866,7 @@ if (!phrase_mode) #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Source read address/pix address: %08X/%1X [%08X%08X]\n", address, pixAddr, +printf(" Source read address/pix address: %08X/%1X [%08X%08X]\n", address, pixAddr, (uint32)(srcd1 >> 32), (uint32)(srcd1 & 0xFFFFFFFF)); fflush(stdout); } @@ -3811,9 +3878,23 @@ fflush(stdout); #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Entering SZREAD state...\n"); +printf(" Entering SZREAD state..."); fflush(stdout); } +#endif + srcz2 = srcz1; + srcz1 = ((uint64)JaguarReadLong(address, BLITTER) << 32) | (uint64)JaguarReadLong(address + 4, BLITTER); +//Kludge to take pixel size into account... I believe that it only has to take 16BPP mode into account. Not sure tho. +if (!phrase_mode && pixsize == 4) + srcz1 >>= 48; + +#ifdef VERBOSE_BLITTER_LOGGING +if (logBlit) +{ + printf(" Src Z read address/pix address: %08X/%1X [%08X%08X]\n", address, pixAddr, + (uint32)(dstz >> 32), (uint32)(dstz & 0xFFFFFFFF)); + fflush(stdout); +} #endif } @@ -3822,7 +3903,7 @@ fflush(stdout); #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Entering DREAD state...\n"); +printf(" Entering DREAD state..."); fflush(stdout); } #endif @@ -3844,7 +3925,7 @@ if (!phrase_mode) #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Dest read address/pix address: %08X/%1X [%08X%08X]\n", address, pixAddr, +printf(" Dest read address/pix address: %08X/%1X [%08X%08X]\n", address, pixAddr, (uint32)(dstd >> 32), (uint32)(dstd & 0xFFFFFFFF)); fflush(stdout); } @@ -3862,6 +3943,10 @@ if (logBlit) } #endif dstz = ((uint64)JaguarReadLong(address, BLITTER) << 32) | (uint64)JaguarReadLong(address + 4, BLITTER); +//Kludge to take pixel size into account... I believe that it only has to take 16BPP mode into account. Not sure tho. +if (!phrase_mode && pixsize == 4) + dstz >>= 48; + #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { @@ -3872,13 +3957,19 @@ if (logBlit) #endif } +// These vars should probably go further up in the code... !!! FIX !!! +// We can't preassign these unless they're static... +//uint64 srcz = 0; // These are assigned to shut up stupid compiler warnings--dwrite is ALWAYS asserted +//bool winhibit = false; +uint64 srcz; +bool winhibit; //NOTE: SRCSHADE requires GOURZ to be set to work properly--another Jaguar I bug if (dwrite) { #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Entering DWRITE state...\n"); +printf(" Entering DWRITE state..."); fflush(stdout); } #endif @@ -3995,11 +4086,8 @@ uint8 pwidth = (((dend | dstart) & 0x07) == 0 ? 0x08 : (dend - dstart) & 0x07); #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Dest write address/pix address: %08X/%1X", address, pixAddr); -printf(" [dstart=%X dend=%X pwidth=%X srcshift=%X]", dstart, dend, pwidth, srcshift); -fflush(stdout); -printf("[daas=%X dabs=%X dam=%X ds=%X daq=%s]", daddasel, daddbsel, daddmode, data_sel, (daddq_sel ? "T" : "F")); -fflush(stdout); + printf(" Dest write address/pix address: %08X/%1X", address, pixAddr); + fflush(stdout); } #endif @@ -4021,6 +4109,56 @@ uint64 srcd = (srcd2 << (64 - srcshift)) | (srcd1 >> srcshift); if (srcshift == 0) srcd = srcd1; +//Z DATA() stuff done here... And it has to be done before any Z shifting... +//Note that we need to have phrase mode start/end support here... (Not since we moved it from dzwrite...!) +/* +Here are a couple of Cybermorph blits with Z: +$00113078 // DSTEN DSTENZ DSTWRZ CLIP_A1 GOURD GOURZ PATDSEL ZMODE=4 +$09900F39 // SRCEN DSTEN DSTENZ DSTWRZ UPDA1 UPDA1F UPDA2 DSTA2 ZMODE=4 LFUFUNC=C DCOMPEN + +We're having the same phrase mode overwrite problem we had with the pixels... !!! FIX !!! +Odd. It's equating 0 with 0... Even though ZMODE is $04 (less than)! +*/ +if (gourz) +{ +/* +void ADDARRAY(uint16 * addq, uint8 daddasel, uint8 daddbsel, uint8 daddmode, + uint64 dstd, uint32 iinc, uint8 initcin[], uint64 initinc, uint16 initpix, + uint32 istep, uint64 patd, uint64 srcd, uint64 srcz1, uint64 srcz2, + uint32 zinc, uint32 zstep) +*/ + uint16 addq[4]; + uint8 initcin[4] = { 0, 0, 0, 0 }; + ADDARRAY(addq, 7/*daddasel*/, 6/*daddbsel*/, 0/*daddmode*/, 0, 0, initcin, 0, 0, 0, 0, 0, srcz1, srcz2, zinc, 0); + srcz2 = ((uint64)addq[3] << 48) | ((uint64)addq[2] << 32) | ((uint64)addq[1] << 16) | (uint64)addq[0]; + ADDARRAY(addq, 6/*daddasel*/, 7/*daddbsel*/, 1/*daddmode*/, 0, 0, initcin, 0, 0, 0, 0, 0, srcz1, srcz2, zinc, 0); + srcz1 = ((uint64)addq[3] << 48) | ((uint64)addq[2] << 32) | ((uint64)addq[1] << 16) | (uint64)addq[0]; + +#ifdef VERBOSE_BLITTER_LOGGING +if (logBlit) +{ + printf("\n[srcz1=%08X%08X, srcz2=%08X%08X, zinc=%08X", + (uint32)(srcz1 >> 32), (uint32)(srcz1 & 0xFFFFFFFF), + (uint32)(srcz2 >> 32), (uint32)(srcz2 & 0xFFFFFFFF), zinc); + fflush(stdout); +} +#endif +} + +uint8 zSrcShift = srcshift & 0x30; +srcz = (srcz2 << (64 - zSrcShift)) | (srcz1 >> zSrcShift); +//bleh, ugly ugly ugly +if (zSrcShift == 0) + srcz = srcz1; + +#ifdef VERBOSE_BLITTER_LOGGING +if (logBlit) +{ + printf(" srcz=%08X%08X]\n", (uint32)(srcz >> 32), (uint32)(srcz & 0xFFFFFFFF)); + fflush(stdout); +} +#endif + //When in SRCSHADE mode, it adds the IINC to the read source (from LFU???) //According to following line, it gets LFU mode. But does it feed the source into the LFU //after the add? @@ -4042,7 +4180,7 @@ if (srcshade) //Temporary kludge, to see if the fractional pattern does anything... //This works, BTW //But it seems to mess up in Cybermorph... the shading should be smooth but it isn't... -//Seems the carry out is lost again... !!! FIX !!! +//Seems the carry out is lost again... !!! FIX !!! [DONE--see below] if (patfadd) { uint16 addq[4]; @@ -4053,15 +4191,17 @@ if (patfadd) //Note that we still don't take atick[0] & [1] into account here, so this will skip half of the data needed... !!! FIX !!! //Not yet enumerated: dbinh, srcdread, srczread +//Also, should do srcshift on the z value in phrase mode... !!! FIX !!! [DONE] +//As well as add a srcz variable we can set external to this state... !!! FIX !!! [DONE] -bool winhibit;// = false; uint64 wdata; uint8 dcomp, zcomp; DATA(wdata, dcomp, zcomp, winhibit, true, cmpdst, daddasel, daddbsel, daddmode, daddq_sel, data_sel, 0/*dbinh*/, dend, dstart, dstd, iinc, lfufunc, patd, patdadd, phrase_mode, srcd, false/*srcdread*/, false/*srczread*/, srcz2add, zmode, - bcompen, bkgwren, dcompen, icount & 0x07, pixsize); + bcompen, bkgwren, dcompen, icount & 0x07, pixsize, + srcz, dstz, zinc); /* Seems that the phrase mode writes with DCOMPEN and DSTEN are corrupting inside of DATA: !!! FIX !!! It's fairly random as well. 7CFE -> 7DFE, 7FCA -> 78CA, 7FA4 -> 78A4, 7F88 -> 8F88 @@ -4143,6 +4283,7 @@ A1_outside := OR6 (a1_outside, a1_x{15}, a1xgr, a1xeq, a1_y{15}, a1ygr, a1yeq); */ //NOTE: There seems to be an off-by-one bug here in the clip_a1 section... !!! FIX !!! // Actually, seems to be related to phrase mode writes... +// Or is it? Could be related to non-15-bit compares as above? if (clip_a1 && ((a1_x & 0x8000) || (a1_y & 0x8000) || (a1_x >= a1_win_x) || (a1_y >= a1_win_y))) winhibit = true; @@ -4162,36 +4303,129 @@ if (!winhibit) else JaguarWriteByte(address, wdata & 0x000000FF, BLITTER); } +} #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { printf(" [%08X%08X]", (uint32)(wdata >> 32), (uint32)(wdata & 0xFFFFFFFF)); + printf(" (icount=%04X, inc=%u)\n", icount, (uint16)inc); + printf(" [dstart=%X dend=%X pwidth=%X srcshift=%X]", dstart, dend, pwidth, srcshift); + printf("[daas=%X dabs=%X dam=%X ds=%X daq=%s]\n", daddasel, daddbsel, daddmode, data_sel, (daddq_sel ? "T" : "F")); fflush(stdout); } #endif -} + } + if (dzwrite) + { +// OK, here's the big insight: When NOT in GOURZ mode, srcz1 & 2 function EXACTLY the same way that +// srcd1 & 2 work--there's an implicit shift from srcz1 to srcz2 whenever srcz1 is read. +// OTHERWISE, srcz1 is the integer for the computed Z and srcz2 is the fractional part. +// Writes to srcz1 & 2 follow the same pattern as the other 64-bit registers--low 32 at the low address, +// high 32 at the high address (little endian!). +// NOTE: GOURZ is still not properly supported. Check patd/patf handling... +// Phrase mode start/end masks are not properly supported either... #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" (icount=%04X, inc=%u)\n", icount, (uint16)inc); -fflush(stdout); + printf(" Entering DZWRITE state..."); + printf(" Dest Z write address/pix address: %08X/%1X [%08X%08X]\n", address, pixAddr, + (uint32)(srcz >> 32), (uint32)(srcz & 0xFFFFFFFF)); + fflush(stdout); } #endif - } - - if (dzwrite) - { +//This is not correct... !!! FIX !!! +//Should be OK now... We'll see... +//Nope. Having the same starstep write problems in phrase mode as we had with pixels... !!! FIX !!! +//This is not causing the problem in Hover Strike... :-/ +//The problem was with the SREADX not shifting. Still problems with Z comparisons & other text in pregame screen... +if (!winhibit) +{ + if (phrase_mode) + { + JaguarWriteLong(address + 0, srcz >> 32, BLITTER); + JaguarWriteLong(address + 4, srcz & 0xFFFFFFFF, BLITTER); + } + else + { + if (pixsize == 4) + JaguarWriteWord(address, srcz & 0x0000FFFF, BLITTER); + } +}//*/ #ifdef VERBOSE_BLITTER_LOGGING if (logBlit) { -printf(" Entering DZWRITE state...\n"); -fflush(stdout); +// printf(" [%08X%08X]\n", (uint32)(srcz >> 32), (uint32)(srcz & 0xFFFFFFFF)); +// fflush(stdout); +//printf(" [dstart=%X dend=%X pwidth=%X srcshift=%X]", dstart, dend, pwidth, srcshift); + printf(" [dstart=? dend=? pwidth=? srcshift=%X]", srcshift); + printf("[daas=%X dabs=%X dam=%X ds=%X daq=%s]\n", daddasel, daddbsel, daddmode, data_sel, (daddq_sel ? "T" : "F")); + fflush(stdout); } #endif } +/* +This is because the address generator was using only 15 bits of the X when it should have +used 16! + +There's a slight problem here: The X pointer isn't wrapping like it should when it hits +the edge of the window... Notice how the X isn't reset at the edge of the window: + +Blit! (CMD = 00010000) +Flags: PATDSEL + count = 160 x 261 + a1_base = 000E8008, a2_base = 0001FA68 + a1_x = 0000, a1_y = 0000, a1_frac_x = 0000, a1_frac_y = 0000, a2_x = 0000, a2_y = 0000 + a1_step_x = 0000, a1_step_y = 0000, a1_stepf_x = 0000, a1_stepf_y = 0000, a2_step_x = 0000, a2_step_y = 0000 + a1_inc_x = 0000, a1_inc_y = 0000, a1_incf_x = 0000, a1_incf_y = 0000 + a1_win_x = 0000, a1_win_y = 0000, a2_mask_x = 0000, a2_mask_y = 0000 + a2_mask=F a1add=+phr/+0 a2add=+phr/+0 + a1_pixsize = 5, a2_pixsize = 5 + srcd=7717771777177717 dstd=0000000000000000 patd=7730773077307730 iinc=00000000 + srcz1=0000000000000000 srcz2=0000000000000000 dstz=0000000000000000 zinc=00000000, coll=0 + Phrase mode is ON + [in=T a1f=F a1=F zf=F z=F a2=F iif=F iii=F izf=F izi=F] + Entering INNER state... + Entering DWRITE state... Dest write address/pix address: 000E8008/0 [7730773077307730] (icount=009E, inc=2) + srcz=0000000000000000][dcomp=AA zcomp=00 dbinh=00] +[srcz=0000000000000000 dstz=0000000000000000 zwdata=0000000000000000 mask=7FFF] + [dstart=0 dend=40 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=0 daq=F] + Entering A1_ADD state [a1_x=0000, a1_y=0000, addasel=0, addbsel=0, modx=1, addareg=F, adda_xconst=1, adda_yconst=0]... + Entering DWRITE state... Dest write address/pix address: 000E8018/0 [7730773077307730] (icount=009C, inc=2) + srcz=0000000000000000][dcomp=AA zcomp=00 dbinh=00] +[srcz=0000000000000000 dstz=0000000000000000 zwdata=0000000000000000 mask=7FFF] + [dstart=0 dend=40 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=0 daq=F] + Entering A1_ADD state [a1_x=0002, a1_y=0000, addasel=0, addbsel=0, modx=1, addareg=F, adda_xconst=1, adda_yconst=0]... + +... + + Entering A1_ADD state [a1_x=009C, a1_y=0000, addasel=0, addbsel=0, modx=1, addareg=F, adda_xconst=1, adda_yconst=0]... + Entering DWRITE state... Dest write address/pix address: 000E84F8/0 [7730773077307730] (icount=0000, inc=2) + srcz=0000000000000000][dcomp=AA zcomp=00 dbinh=00] +[srcz=0000000000000000 dstz=0000000000000000 zwdata=0000000000000000 mask=7FFF] + [dstart=0 dend=40 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=0 daq=F] + Entering A1_ADD state [a1_x=009E, a1_y=0000, addasel=0, addbsel=0, modx=1, addareg=F, adda_xconst=1, adda_yconst=0]... + Entering IDLE_INNER state... + + Leaving INNER state... (ocount=0104) + [in=T a1f=F a1=F zf=F z=F a2=F iif=F iii=F izf=F izi=F] + + Entering INNER state... + Entering DWRITE state... Dest write address/pix address: 000E8508/0 [7730773077307730] (icount=009E, inc=2) + srcz=0000000000000000][dcomp=AA zcomp=00 dbinh=00] +[srcz=0000000000000000 dstz=0000000000000000 zwdata=0000000000000000 mask=7FFF] + [dstart=0 dend=40 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=0 daq=F] + Entering A1_ADD state [a1_x=00A0, a1_y=0000, addasel=0, addbsel=0, modx=1, addareg=F, adda_xconst=1, adda_yconst=0]... + Entering DWRITE state... Dest write address/pix address: 000E8518/0 [7730773077307730] (icount=009C, inc=2) + srcz=0000000000000000][dcomp=AA zcomp=00 dbinh=00] +[srcz=0000000000000000 dstz=0000000000000000 zwdata=0000000000000000 mask=7FFF] + [dstart=0 dend=40 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=0 daq=F] + Entering A1_ADD state [a1_x=00A2, a1_y=0000, addasel=0, addbsel=0, modx=1, addareg=F, adda_xconst=1, adda_yconst=0]... + +*/ + if (a1_add) { #ifdef VERBOSE_BLITTER_LOGGING @@ -4421,122 +4655,86 @@ fflush(stdout); } } +// We never get here! !!! FIX !!! + +#ifdef VERBOSE_BLITTER_LOGGING +if (logBlit) +{ + printf("Done!\na1_x=%04X a1_y=%04X a1_frac_x=%04X a1_frac_y=%04X a2_x=%04X a2_y%04X\n", + GET16(blitter_ram, A1_PIXEL + 2), + GET16(blitter_ram, A1_PIXEL + 0), + GET16(blitter_ram, A1_FPIXEL + 2), + GET16(blitter_ram, A1_FPIXEL + 0), + GET16(blitter_ram, A2_PIXEL + 2), + GET16(blitter_ram, A2_PIXEL + 0)); + fflush(stdout); +} +#endif + // Write values back to registers (in real blitter, these are continuously updated) - SET16(blitter_ram, A1_PIXEL + 0, a1_y); SET16(blitter_ram, A1_PIXEL + 2, a1_x); - SET16(blitter_ram, A1_FPIXEL + 0, a1_frac_y); + SET16(blitter_ram, A1_PIXEL + 0, a1_y); SET16(blitter_ram, A1_FPIXEL + 2, a1_frac_x); - SET16(blitter_ram, A2_PIXEL + 0, a2_y); + SET16(blitter_ram, A1_FPIXEL + 0, a1_frac_y); SET16(blitter_ram, A2_PIXEL + 2, a2_x); -} + SET16(blitter_ram, A2_PIXEL + 0, a2_y); +#ifdef VERBOSE_BLITTER_LOGGING +if (logBlit) +{ + printf("Writeback!\na1_x=%04X a1_y=%04X a1_frac_x=%04X a1_frac_y=%04X a2_x=%04X a2_y%04X\n", + GET16(blitter_ram, A1_PIXEL + 2), + GET16(blitter_ram, A1_PIXEL + 0), + GET16(blitter_ram, A1_FPIXEL + 2), + GET16(blitter_ram, A1_FPIXEL + 0), + GET16(blitter_ram, A2_PIXEL + 2), + GET16(blitter_ram, A2_PIXEL + 0)); + fflush(stdout); +} +#endif +} /* -The latest that doesn't work properly: - -Blit! (CMD = 09800741) -Flags: SRCEN CLIP_A1 UPDA1 UPDA1F UPDA2 LFUFUNC=C DCOMPEN - count = 15 x 18 - a1_base = 00050000, a2_base = 0083F400 - a1_x = 003D, a1_y = 00AD, a1_frac_x = 8000, a1_frac_y = 0000, a2_x = 0027, a2_y = 00A4 - a1_step_x = FFF1, a1_step_y = 0001, a1_stepf_x = 0000, a1_stepf_y = 0000, a2_step_x = FFF1, a2_step_y = 0001 - a1_inc_x = 0001, a1_inc_y = 0000, a1_incf_x = 0000, a1_incf_y = 0000 - a1_win_x = 0180, a1_win_y = 0118, a2_mask_x = 0000, a2_mask_y = 0000 - a2_mask=F a1add=+inc/+0 a2add=+1/+0 - a1_pixsize = 4, a2_pixsize = 4 - srcd=0000000000000000 dstd=0000000000000000 patd=0000000000000000 iinc=00FFF000 - srcz1=0000000000000000 srcz2=0000000000000000 dstz=0000000000000000 zinc=00000000, col=2 - Phrase mode is off - [in=T a1f=F a1=F zf=F z=F a2=F iif=F iii=F izf=F izi=F] - Entering INNER state... - Entering SREAD state... Source read address/pix address: 00858E4E/0 [0000000000000000] - Entering A2_ADD state [a2_x=0027, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 0007077A/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [0000000000000000] (icount=000E, inc=1) - Entering A1_ADD state [a1_x=003D, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E50/0 [0000000000000000] - Entering A2_ADD state [a2_x=0028, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 0007077C/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [0000000000000000] (icount=000D, inc=1) - Entering A1_ADD state [a1_x=003E, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E52/0 [0000000000000000] - Entering A2_ADD state [a2_x=0029, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 0007077E/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [0000000000000000] (icount=000C, inc=1) - Entering A1_ADD state [a1_x=003F, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E54/0 [000000000000014A] - Entering A2_ADD state [a2_x=002A, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070780/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=000B, inc=1) - Entering A1_ADD state [a1_x=0040, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E56/0 [000000000000014A] - Entering A2_ADD state [a2_x=002B, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070782/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=000A, inc=1) - Entering A1_ADD state [a1_x=0041, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E58/0 [000000000000014A] - Entering A2_ADD state [a2_x=002C, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070784/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=0009, inc=1) - Entering A1_ADD state [a1_x=0042, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E5A/0 [000000000000014A] - Entering A2_ADD state [a2_x=002D, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070786/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=0008, inc=1) - Entering A1_ADD state [a1_x=0043, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E5C/0 [000000000000014A] - Entering A2_ADD state [a2_x=002E, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070788/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=0007, inc=1) - Entering A1_ADD state [a1_x=0044, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E5E/0 [000000000000014A] - Entering A2_ADD state [a2_x=002F, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 0007078A/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=0006, inc=1) - Entering A1_ADD state [a1_x=0045, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E60/0 [000000000000014A] - Entering A2_ADD state [a2_x=0030, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 0007078C/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=0005, inc=1) - Entering A1_ADD state [a1_x=0046, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E62/0 [000000000000014A] - Entering A2_ADD state [a2_x=0031, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 0007078E/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=0004, inc=1) - Entering A1_ADD state [a1_x=0047, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E64/0 [000000000000014A] - Entering A2_ADD state [a2_x=0032, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070790/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [000000000000014A] (icount=0003, inc=1) - Entering A1_ADD state [a1_x=0048, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E66/0 [0000000000000000] - Entering A2_ADD state [a2_x=0033, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070792/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [0000000000000000] (icount=0002, inc=1) - Entering A1_ADD state [a1_x=0049, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E68/0 [0000000000000000] - Entering A2_ADD state [a2_x=0034, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070794/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [0000000000000000] (icount=0001, inc=1) - Entering A1_ADD state [a1_x=004A, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering SREAD state... Source read address/pix address: 00858E6A/0 [0000000000000000] - Entering A2_ADD state [a2_x=0035, a2_y=00A4, addasel=0, addbsel=1, modx=0, addareg=F, adda_xconst=0, adda_yconst=0]... - Entering DWRITE state... - Dest write address/pix address: 00070796/0 [dstart=0 dend=10 pwidth=8 srcshift=0][daas=0 dabs=0 dam=7 ds=1 daq=F] [0000000000000000] (icount=0000, inc=1) - Entering A1_ADD state [a1_x=004B, a1_y=00AD, addasel=3, addbsel=2, modx=0, addareg=T, adda_xconst=7, adda_yconst=0]... - Entering IDLE_INNER state... - Leaving INNER state... (ocount=0011) - [in=F a1f=T a1=F zf=F z=F a2=F iif=F iii=F izf=F izi=F] - Entering A1FUPDATE state... - [in=F a1f=F a1=T zf=F z=F a2=F iif=F iii=F izf=F izi=F] - Entering A1UPDATE state... (76/173 -> 61/174) - [in=F a1f=F a1=F zf=F z=F a2=T iif=F iii=F izf=F izi=F] - Entering A2UPDATE state... (54/164 -> 39/165) - [in=T a1f=F a1=F zf=F z=F a2=F iif=F iii=F izf=F izi=F] - Entering INNER state... + int16 a1_x = (int16)GET16(blitter_ram, A1_PIXEL + 2); + int16 a1_y = (int16)GET16(blitter_ram, A1_PIXEL + 0); + uint16 a1_frac_x = GET16(blitter_ram, A1_FPIXEL + 2); + uint16 a1_frac_y = GET16(blitter_ram, A1_FPIXEL + 0); + int16 a2_x = (int16)GET16(blitter_ram, A2_PIXEL + 2); + int16 a2_y = (int16)GET16(blitter_ram, A2_PIXEL + 0); + +Seems that the ending a1_x should be written between blits, but it doesn't seem to be... + +Blit! (CMD = 01800000) +Flags: LFUFUNC=C + count = 28672 x 1 + a1_base = 00050000, a2_base = 00070000 + a1_x = 0000, a1_y = 0000, a1_frac_x = 49CD, a1_frac_y = 0000, a2_x = 0033, a2_y = 0001 + a1_step_x = 0000, a1_step_y = 0000, a1_stepf_x = 939A, a1_stepf_y = 0000, a2_step_x = 0000, a2_step_y = 0000 + a1_inc_x = 0000, a1_inc_y = 0000, a1_incf_x = 0000, a1_incf_y = 0000 + a1_win_x = 0100, a1_win_y = 0020, a2_mask_x = 0000, a2_mask_y = 0000 + a2_mask=F a1add=+phr/+0 a2add=+phr/+0 + a1_pixsize = 4, a2_pixsize = 3 + srcd=DEDEDEDEDEDEDEDE dstd=0000000000000000 patd=0000000000000000 iinc=00000000 + srcz1=0000000000000000 srcz2=0000000000000000 dstz=0000000000000000 zinc=00000000, coll=0 + Phrase mode is ON + +Blit! (CMD = 01800000) +Flags: LFUFUNC=C + count = 28672 x 1 + a1_base = 00050000, a2_base = 00070000 + a1_x = 0000, a1_y = 0000, a1_frac_x = 49CD, a1_frac_y = 0000, a2_x = 0033, a2_y = 0001 + a1_step_x = 0000, a1_step_y = 0000, a1_stepf_x = 939A, a1_stepf_y = 0000, a2_step_x = 0000, a2_step_y = 0000 + a1_inc_x = 0000, a1_inc_y = 0000, a1_incf_x = 0000, a1_incf_y = 0000 + a1_win_x = 0100, a1_win_y = 0020, a2_mask_x = 0000, a2_mask_y = 0000 + a2_mask=F a1add=+phr/+0 a2add=+phr/+0 + a1_pixsize = 4, a2_pixsize = 3 + srcd=D6D6D6D6D6D6D6D6 dstd=0000000000000000 patd=0000000000000000 iinc=00000000 + srcz1=0000000000000000 srcz2=0000000000000000 dstz=0000000000000000 zinc=00000000, coll=0 + Phrase mode is ON */ + // Various pieces of the blitter puzzle are teased out here... @@ -4571,7 +4769,8 @@ void ADDRGEN(uint32 &address, uint32 &pixa, bool gena2, bool zaddr, uint16 a1_x, uint16 a1_y, uint32 a1_base, uint8 a1_pitch, uint8 a1_pixsize, uint8 a1_width, uint8 a1_zoffset, uint16 a2_x, uint16 a2_y, uint32 a2_base, uint8 a2_pitch, uint8 a2_pixsize, uint8 a2_width, uint8 a2_zoffset) { - uint16 x = (gena2 ? a2_x : a1_x) & 0x7FFF; +// uint16 x = (gena2 ? a2_x : a1_x) & 0x7FFF; + uint16 x = (gena2 ? a2_x : a1_x) & 0xFFFF; // Actually uses all 16 bits to generate address...! uint16 y = (gena2 ? a2_y : a1_y) & 0x0FFF; uint8 width = (gena2 ? a2_width : a1_width); uint8 pixsize = (gena2 ? a2_pixsize : a1_pixsize); @@ -5274,14 +5473,15 @@ void DATA(uint64 &wdata, uint8 &dcomp, uint8 &zcomp, bool &nowrite, bool big_pix, bool cmpdst, uint8 daddasel, uint8 daddbsel, uint8 daddmode, bool daddq_sel, uint8 data_sel, uint8 dbinh, uint8 dend, uint8 dstart, uint64 dstd, uint32 iinc, uint8 lfu_func, uint64 &patd, bool patdadd, bool phrase_mode, uint64 srcd, bool srcdread, bool srczread, bool srcz2add, uint8 zmode, - bool bcompen, bool bkgwren, bool dcompen, uint8 icount, uint8 pixsize) + bool bcompen, bool bkgwren, bool dcompen, uint8 icount, uint8 pixsize, + uint64 &srcz, uint64 dstz, uint32 zinc) { /* Stuff we absolutely *need* to have passed in/out: IN: patdadd, dstd, srcd, patd, daddasel, daddbsel, daddmode, iinc, srcz1, srcz2, big_pix, phrase_mode, cmpdst OUT: - changed patd (wdata I guess...) + changed patd (wdata I guess...) (Nope. We pass it back directly now...) */ // Source data registers @@ -5360,23 +5560,66 @@ Zstep := JOIN (zstep, zstep[0..31]);*/ dcomp |= 0x40; if ((cmpd & 0xFF00000000000000LL) == 0) dcomp |= 0x80; +////////////////////////////////////////////////////////////////////////////////////// + +// Zed comparator for Z-buffer operations + +/*Zedcomp := ZEDCOMP (zcomp[0..3], srczp[0..1], dstz[0..1], zmode[0..2]);*/ +////////////////////////////////////// C++ CODE ////////////////////////////////////// +//srczp is srcz pipelined, also it goes through a source shift as well... +/*The shift is basically like so (each piece is 16 bits long): + + 0 1 2 3 4 5 6 + srcz1lolo srcz1lohi srcz1hilo srcz1hihi srcrz2lolo srcz2lohi srcz2hilo + +with srcshift bits 4 & 5 selecting the start position +*/ +//So... basically what we have here is: + zcomp = 0; + + if ((((srcz & 0x000000000000FFFFLL) < (dstz & 0x000000000000FFFFLL)) && (zmode & 0x01)) + || (((srcz & 0x000000000000FFFFLL) == (dstz & 0x000000000000FFFFLL)) && (zmode & 0x02)) + || (((srcz & 0x000000000000FFFFLL) > (dstz & 0x000000000000FFFFLL)) && (zmode & 0x04))) + zcomp |= 0x01; + + if ((((srcz & 0x00000000FFFF0000LL) < (dstz & 0x00000000FFFF0000LL)) && (zmode & 0x01)) + || (((srcz & 0x00000000FFFF0000LL) == (dstz & 0x00000000FFFF0000LL)) && (zmode & 0x02)) + || (((srcz & 0x00000000FFFF0000LL) > (dstz & 0x00000000FFFF0000LL)) && (zmode & 0x04))) + zcomp |= 0x02; + + if ((((srcz & 0x0000FFFF00000000LL) < (dstz & 0x0000FFFF00000000LL)) && (zmode & 0x01)) + || (((srcz & 0x0000FFFF00000000LL) == (dstz & 0x0000FFFF00000000LL)) && (zmode & 0x02)) + || (((srcz & 0x0000FFFF00000000LL) > (dstz & 0x0000FFFF00000000LL)) && (zmode & 0x04))) + zcomp |= 0x04; + + if ((((srcz & 0xFFFF000000000000LL) < (dstz & 0xFFFF000000000000LL)) && (zmode & 0x01)) + || (((srcz & 0xFFFF000000000000LL) == (dstz & 0xFFFF000000000000LL)) && (zmode & 0x02)) + || (((srcz & 0xFFFF000000000000LL) > (dstz & 0xFFFF000000000000LL)) && (zmode & 0x04))) + zcomp |= 0x08; + +//TEMP, TO TEST IF ZCOMP IS THE CULPRIT... +//Nope, this is NOT the problem... +//zcomp=0; // We'll do the comparison/bit/byte inhibits here, since that's they way it happens // in the real thing (dcomp goes out to COMP_CTRL and back into DATA through dbinh)... #if 1 uint8 dbinht; // bool nowrite; COMP_CTRL(dbinht, nowrite, - bcompen, true/*big_pix*/, bkgwren, dcomp, dcompen, icount, pixsize, phrase_mode, srcd & 0xFF, 0);//zcomp); + bcompen, true/*big_pix*/, bkgwren, dcomp, dcompen, icount, pixsize, phrase_mode, srcd & 0xFF, zcomp); dbinh = dbinht; // dbinh = 0x00; #endif -////////////////////////////////////////////////////////////////////////////////////// - -// Zed comparator for Z-buffer operations - -/*Zedcomp := ZEDCOMP (zcomp[0..3], srczp[0..1], dstz[0..1], zmode[0..2]);*/ -////////////////////////////////////// C++ CODE ////////////////////////////////////// +#if 1 +#ifdef VERBOSE_BLITTER_LOGGING +if (logBlit) +{ + printf("\n[dcomp=%02X zcomp=%02X dbinh=%02X]\n", dcomp, zcomp, dbinh); + fflush(stdout); +}//*/ +#endif +#endif ////////////////////////////////////////////////////////////////////////////////////// // 22 Mar 94 @@ -5401,7 +5644,7 @@ Zstep := JOIN (zstep, zstep[0..31]);*/ //This is normally done asynchronously above (thru local_data) when in patdadd mode... //And now it's passed back to the caller to be persistent between calls...! -//But it's causing some serious fuck-ups in T2K now... !!! FIX !!! +//But it's causing some serious fuck-ups in T2K now... !!! FIX !!! [DONE--???] //Weird! It doesn't anymore...! if (patdadd) patd = ((uint64)addq[3] << 48) | ((uint64)addq[2] << 32) | ((uint64)addq[1] << 16) | (uint64)addq[0]; @@ -5627,6 +5870,25 @@ Dat[56-63] := MX4 (dat[56-63], dstdhi{24-31}, ddathi{24-31}, dstzhi{24-31}, srcz (uint32)(wdata >> 32), (uint32)(wdata & 0xFFFFFFFF), mask); fflush(stdout); }//*/ +//This is a crappy way of handling this, but it should work for now... + uint64 zwdata; + zwdata = ((srcz & mask) | (dstz & ~mask)) & 0x00000000000000FFLL; + zwdata |= (mask & 0x0100 ? srcz : dstz) & 0x000000000000FF00LL; + zwdata |= (mask & 0x0200 ? srcz : dstz) & 0x0000000000FF0000LL; + zwdata |= (mask & 0x0400 ? srcz : dstz) & 0x00000000FF000000LL; + zwdata |= (mask & 0x0800 ? srcz : dstz) & 0x000000FF00000000LL; + zwdata |= (mask & 0x1000 ? srcz : dstz) & 0x0000FF0000000000LL; + zwdata |= (mask & 0x2000 ? srcz : dstz) & 0x00FF000000000000LL; + zwdata |= (mask & 0x4000 ? srcz : dstz) & 0xFF00000000000000LL; +if (logBlit) +{ + printf("\n[srcz=%08X%08X dstz=%08X%08X zwdata=%08X%08X mask=%04X]\n", + (uint32)(srcz >> 32), (uint32)(srcz & 0xFFFFFFFF), + (uint32)(dstz >> 32), (uint32)(dstz & 0xFFFFFFFF), + (uint32)(zwdata >> 32), (uint32)(zwdata & 0xFFFFFFFF), mask); + fflush(stdout); +}//*/ + srcz = zwdata; ////////////////////////////////////////////////////////////////////////////////////// /*Data_enab[0-1] := BUF8 (data_enab[0-1], data_ena);