From 7a5cb358284a6d36dc073a1f084213618b761804 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 25 Jul 2021 12:26:43 +1000 Subject: srcclean for 0.234 branch --- hash/apple2_flop_orig.xml | 10 +- hash/ibm5170_cdrom.xml | 2 +- src/devices/bus/a2bus/lancegs.cpp | 126 ++++++------ src/devices/bus/isa/aga.h | 2 +- src/devices/machine/k056230.cpp | 4 +- src/devices/sound/swp30.cpp | 6 +- src/devices/video/voodoo.cpp | 10 +- src/devices/video/voodoo.h | 6 +- src/devices/video/voodoo_2.cpp | 6 +- src/devices/video/voodoo_banshee.cpp | 36 ++-- src/devices/video/voodoo_regs.h | 130 ++++++------ src/devices/video/voodoo_render.cpp | 372 +++++++++++++++++------------------ src/devices/video/voodoo_render.h | 2 +- src/mame/audio/efo_zsu.cpp | 6 +- src/mame/drivers/alpha68k.cpp | 6 +- src/mame/drivers/apple3.cpp | 2 +- src/mame/drivers/bowltry.cpp | 28 +-- src/mame/drivers/cobra.cpp | 4 +- src/mame/drivers/lwriter.cpp | 4 +- src/mame/drivers/namcos2.cpp | 10 +- src/mame/drivers/segas16b.cpp | 22 +-- src/mame/drivers/vsmjtria.cpp | 4 +- src/mame/drivers/zr107.cpp | 2 +- src/mame/video/k001005.cpp | 90 ++++----- src/mame/video/k001005.h | 2 +- src/mame/video/k001604.cpp | 2 +- 26 files changed, 447 insertions(+), 447 deletions(-) diff --git a/hash/apple2_flop_orig.xml b/hash/apple2_flop_orig.xml index 3872051e996..9c8588afd7d 100644 --- a/hash/apple2_flop_orig.xml +++ b/hash/apple2_flop_orig.xml @@ -16933,12 +16933,12 @@ license:CC0 + Other 3.5-inch drives, such as the AppleDisk 3.5 (A2M0106) or + Apple SuperDrive (G7287), will not work due to + incompatibilities created by the copy protection. --> diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml index 0fbbe7f0d8c..2d87210c0da 100644 --- a/hash/ibm5170_cdrom.xml +++ b/hash/ibm5170_cdrom.xml @@ -3074,7 +3074,7 @@ license:CC0 - + Lotus Notes Express v3.30 for OS2, Special Promotion Copy NFR 1995 diff --git a/src/devices/bus/a2bus/lancegs.cpp b/src/devices/bus/a2bus/lancegs.cpp index 137d76eca34..8182809c045 100644 --- a/src/devices/bus/a2bus/lancegs.cpp +++ b/src/devices/bus/a2bus/lancegs.cpp @@ -62,25 +62,25 @@ DEFINE_DEVICE_TYPE(A2BUS_LANCEGS, a2bus_lancegs_device, "a2lancegs", "///SHH Sys //************************************************************************** a2bus_lancegs_device::a2bus_lancegs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - a2bus_lancegs_device(mconfig, A2BUS_LANCEGS, tag, owner, clock) + a2bus_lancegs_device(mconfig, A2BUS_LANCEGS, tag, owner, clock) { } a2bus_lancegs_device::a2bus_lancegs_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, type, tag, owner, clock), - device_a2bus_card_interface(mconfig, *this), - m_netinf(*this, "smc91c96"), - m_i2cmem(*this, "i2cmem"), - m_shadow(false) + device_t(mconfig, type, tag, owner, clock), + device_a2bus_card_interface(mconfig, *this), + m_netinf(*this, "smc91c96"), + m_i2cmem(*this, "i2cmem"), + m_shadow(false) { } void a2bus_lancegs_device::device_add_mconfig(machine_config &config) { - SMC91C96(config, m_netinf, 20_MHz_XTAL); // Datasheet fig 12.26, pg 122. - I2C_24C04(config, m_i2cmem, 0).set_address(0x80).set_e0(1); + SMC91C96(config, m_netinf, 20_MHz_XTAL); // Datasheet fig 12.26, pg 122. + I2C_24C04(config, m_i2cmem, 0).set_address(0x80).set_e0(1); - m_netinf->irq_handler().set(FUNC(a2bus_lancegs_device::netinf_irq_w)); + m_netinf->irq_handler().set(FUNC(a2bus_lancegs_device::netinf_irq_w)); } //------------------------------------------------- @@ -89,12 +89,12 @@ void a2bus_lancegs_device::device_add_mconfig(machine_config &config) void a2bus_lancegs_device::device_start() { - save_item(NAME(m_shadow)); + save_item(NAME(m_shadow)); } void a2bus_lancegs_device::device_reset() { - m_shadow = false; + m_shadow = false; } /*------------------------------------------------- @@ -103,23 +103,23 @@ void a2bus_lancegs_device::device_reset() uint8_t a2bus_lancegs_device::read_c0nx(uint8_t offset) { - if (m_shadow) { - switch(offset) { - case 0x08: /* read data */ - return 0xfe | m_i2cmem->read_sda(); - break; - case 0x0f: - return 0x33; - break; - default: - return 0xff; - break; - } - } else { - const uint16_t mask = offset & 0x01 ? 0xff00: 0x00ff; - const uint16_t value = m_netinf->read(offset >> 1, mask); - return offset & 0x01 ? value >> 8 : value; - } + if (m_shadow) { + switch(offset) { + case 0x08: /* read data */ + return 0xfe | m_i2cmem->read_sda(); + break; + case 0x0f: + return 0x33; + break; + default: + return 0xff; + break; + } + } else { + const uint16_t mask = offset & 0x01 ? 0xff00: 0x00ff; + const uint16_t value = m_netinf->read(offset >> 1, mask); + return offset & 0x01 ? value >> 8 : value; + } } /*------------------------------------------------- @@ -128,51 +128,51 @@ uint8_t a2bus_lancegs_device::read_c0nx(uint8_t offset) void a2bus_lancegs_device::write_c0nx(uint8_t offset, uint8_t data) { - if (offset == 0x0f) { - m_shadow = data & 0x01; - return; - } - - if (m_shadow) { - switch(offset) { - case 0x04: /* set clock low */ - m_i2cmem->write_scl(0); - break; - case 0x05: /* set clock high */ - m_i2cmem->write_scl(1); - break; - case 0x06: /* set data low */ - m_i2cmem->write_sda(0); - break; - case 0x07: /* set data high */ - m_i2cmem->write_sda(1); - break; - default: - break; - } - } else { - const uint16_t mask = offset & 0x01 ? 0xff00: 0x00ff; - const uint16_t value = offset & 0x01 ? data << 8 : data; - m_netinf->write(offset >> 1, value, mask); - } + if (offset == 0x0f) { + m_shadow = data & 0x01; + return; + } + + if (m_shadow) { + switch(offset) { + case 0x04: /* set clock low */ + m_i2cmem->write_scl(0); + break; + case 0x05: /* set clock high */ + m_i2cmem->write_scl(1); + break; + case 0x06: /* set data low */ + m_i2cmem->write_sda(0); + break; + case 0x07: /* set data high */ + m_i2cmem->write_sda(1); + break; + default: + break; + } + } else { + const uint16_t mask = offset & 0x01 ? 0xff00: 0x00ff; + const uint16_t value = offset & 0x01 ? data << 8 : data; + m_netinf->write(offset >> 1, value, mask); + } } WRITE_LINE_MEMBER( a2bus_lancegs_device::netinf_irq_w ) { - if (state) { - raise_slot_irq(); - } else { - lower_slot_irq(); - } + if (state) { + raise_slot_irq(); + } else { + lower_slot_irq(); + } } ROM_START(lancegs) - ROM_REGION(0x0200, "i2cmem", 0) - ROM_LOAD("lancegs.nv", 0x0000, 0x0200, NO_DUMP) + ROM_REGION(0x0200, "i2cmem", 0) + ROM_LOAD("lancegs.nv", 0x0000, 0x0200, NO_DUMP) ROM_END const tiny_rom_entry *a2bus_lancegs_device::device_rom_region() const { - return ROM_NAME(lancegs); + return ROM_NAME(lancegs); } diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h index ef09d7b12e2..b5f986e9a34 100644 --- a/src/devices/bus/isa/aga.h +++ b/src/devices/bus/isa/aga.h @@ -14,7 +14,7 @@ // 256 8x8 thick chars // 256 8x8 thin chars // 256 9x14 in 8x16 chars, line 3 is connected to a10 - ROM_LOAD("aga.chr", 0x0000, 0x2000, CRC(aca81498) SHA1(0d84c89487ee7a6ac4c9e73fdb30c5fd8aa595f8) ) + ROM_LOAD("aga.chr", 0x0000, 0x2000, CRC(aca81498) SHA1(0d84c89487ee7a6ac4c9e73fdb30c5fd8aa595f8) ) // hercules font of above ROM_LOAD("hercules.chr", 0x0000, 0x1000, CRC(7e8c9d76)) diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp index 8c0ad5d628c..c14458c99f5 100644 --- a/src/devices/machine/k056230.cpp +++ b/src/devices/machine/k056230.cpp @@ -56,7 +56,7 @@ uint8_t k056230_device::read(offs_t offset) { return 0x08; } - case 1: // CRC Error register + case 1: // CRC Error register { return 0x00; } @@ -80,7 +80,7 @@ void k056230_device::write(offs_t offset, uint8_t data) if(data & 0x20) { if (m_cpu) - m_cpu->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE); + m_cpu->set_input_line(INPUT_LINE_IRQ2, ASSERT_LINE); } if ((data & 1) == 0) { diff --git a/src/devices/sound/swp30.cpp b/src/devices/sound/swp30.cpp index 1f1be098132..e0a7abc71e2 100644 --- a/src/devices/sound/swp30.cpp +++ b/src/devices/sound/swp30.cpp @@ -720,7 +720,7 @@ u16 swp30_device::internal_r() case 4: // used at 44c4 // tests & 0x4000 only - // logerror("read %02x.4\n", chan); + // logerror("read %02x.4\n", chan); return 0xffff; case 6: @@ -847,7 +847,7 @@ void swp30_device::change_mode(int channel, u8 mode) mode == SUSTAIN ? "sustain" : mode == RELEASE ? "release" : "?"); - + m_mode[channel] = mode; if(mode == IDLE || mode == SUSTAIN) { m_step_volume[channel] = 0; @@ -999,7 +999,7 @@ void swp30_device::sound_stream_update(sound_stream &stream, std::vector 0 && raw_vol >= target)) { raw_vol = target; m_current_volume[channel] = raw_vol; - + // IDLE and SUSTAIN have zero step. // current volume must be updated before calling change_mode diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp index 89da0f1b08c..472f5c5fd47 100644 --- a/src/devices/video/voodoo.cpp +++ b/src/devices/video/voodoo.cpp @@ -1149,8 +1149,8 @@ u16 *voodoo_1_device::draw_buffer_indirect(int index) { switch (index) { - case 0: m_video_changed = true; return front_buffer(); - case 1: return back_buffer(); + case 0: m_video_changed = true; return front_buffer(); + case 1: return back_buffer(); default: return nullptr; } } @@ -1166,8 +1166,8 @@ u16 *voodoo_1_device::lfb_buffer_indirect(int index) { switch (index) { - case 0: m_video_changed = true; return front_buffer(); - case 1: return back_buffer(); + case 0: m_video_changed = true; return front_buffer(); + case 1: return back_buffer(); case 2: return aux_buffer(); default: return nullptr; } @@ -2837,7 +2837,7 @@ void voodoo_1_device::recompute_video_memory_common(u32 config, u32 rowpixels) switch (config) { case 3: // reserved -// logerror("VOODOO.ERROR:Unexpected memory configuration in recompute_video_memory!\n"); +// logerror("VOODOO.ERROR:Unexpected memory configuration in recompute_video_memory!\n"); [[fallthrough]]; case 0: // 2 color buffers, 1 aux buffer m_rgboffs[2] = ~0; diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h index 7c56fb985d2..f3642a63700 100644 --- a/src/devices/video/voodoo.h +++ b/src/devices/video/voodoo.h @@ -38,9 +38,9 @@ enum class voodoo_model : u8 }; // debug -static constexpr bool DEBUG_DEPTH = false; // ENTER key to view depthbuf -static constexpr bool DEBUG_BACKBUF = false; // L key to view backbuf -static constexpr bool DEBUG_STATS = false; // \ key to view stats +static constexpr bool DEBUG_DEPTH = false; // ENTER key to view depthbuf +static constexpr bool DEBUG_BACKBUF = false; // L key to view backbuf +static constexpr bool DEBUG_STATS = false; // \ key to view stats // logging static constexpr bool LOG_VBLANK_SWAP = false; diff --git a/src/devices/video/voodoo_2.cpp b/src/devices/video/voodoo_2.cpp index 6a86195081f..6cd34433bff 100644 --- a/src/devices/video/voodoo_2.cpp +++ b/src/devices/video/voodoo_2.cpp @@ -233,7 +233,7 @@ u32 command_fifo::words_needed(u32 command) // 0 2:0 = Packet type (3) // determine words per vertex - u32 count = 2; // X/Y + u32 count = 2; // X/Y if (BIT(command, 28)) count += (BIT(command, 10, 2) != 0) ? 1 : 0; // ARGB in one word else @@ -263,7 +263,7 @@ u32 command_fifo::words_needed(u32 command) case 5: // Packet type 5: 2 + N words // - // Word Bits + // Word Bits // 0 31:30 = Space (0,1=reserved, 2=LFB, 3=texture) // 0 29:26 = Byte disable W2 // 0 25:22 = Byte disable WN @@ -558,7 +558,7 @@ u32 command_fifo::packet_type_5(u32 command) { // Packet type 5: 2 + N words // - // Word Bits + // Word Bits // 0 31:30 = Space (0,1=reserved, 2=LFB, 3=texture) // 0 29:26 = Byte disable W2 // 0 25:22 = Byte disable WN diff --git a/src/devices/video/voodoo_banshee.cpp b/src/devices/video/voodoo_banshee.cpp index 5ad277c83e0..40706694004 100644 --- a/src/devices/video/voodoo_banshee.cpp +++ b/src/devices/video/voodoo_banshee.cpp @@ -233,11 +233,11 @@ u32 voodoo_banshee_device::read(offs_t offset, u32 mem_mask) case 0x0080000 >> 19: return map_cmd_agp_r(offset - 0x0080000/4); - case 0x0100000 >> 19: case 0x0180000 >> 19: + case 0x0100000 >> 19: case 0x0180000 >> 19: return map_2d_r(offset - 0x0100000/4); - case 0x0200000 >> 19: case 0x0280000 >> 19: case 0x0300000 >> 19: case 0x0380000 >> 19: - case 0x0400000 >> 19: case 0x0480000 >> 19: case 0x0500000 >> 19: case 0x0580000 >> 19: + case 0x0200000 >> 19: case 0x0280000 >> 19: case 0x0300000 >> 19: case 0x0380000 >> 19: + case 0x0400000 >> 19: case 0x0480000 >> 19: case 0x0500000 >> 19: case 0x0580000 >> 19: return map_register_r(offset - 0x0200000/4); default: @@ -264,37 +264,37 @@ void voodoo_banshee_device::write(offs_t offset, u32 data, u32 mem_mask) map_cmd_agp_w(offset - 0x0080000/4, data, mem_mask); break; - case 0x0100000 >> 19: case 0x0180000 >> 19: + case 0x0100000 >> 19: case 0x0180000 >> 19: map_2d_w(offset - 0x0100000/4, data, mem_mask); break; - case 0x0200000 >> 19: case 0x0280000 >> 19: case 0x0300000 >> 19: case 0x0380000 >> 19: - case 0x0400000 >> 19: case 0x0480000 >> 19: case 0x0500000 >> 19: case 0x0580000 >> 19: + case 0x0200000 >> 19: case 0x0280000 >> 19: case 0x0300000 >> 19: case 0x0380000 >> 19: + case 0x0400000 >> 19: case 0x0480000 >> 19: case 0x0500000 >> 19: case 0x0580000 >> 19: map_register_w(offset - 0x0200000/4, data, mem_mask); break; - case 0x0600000 >> 19: case 0x0680000 >> 19: case 0x0700000 >> 19: case 0x0780000 >> 19: + case 0x0600000 >> 19: case 0x0680000 >> 19: case 0x0700000 >> 19: case 0x0780000 >> 19: map_texture_w<0>(offset - 0x0600000, data, mem_mask); break; - case 0x0800000 >> 19: case 0x0880000 >> 19: case 0x0900000 >> 19: case 0x0980000 >> 19: + case 0x0800000 >> 19: case 0x0880000 >> 19: case 0x0900000 >> 19: case 0x0980000 >> 19: if (BIT(m_chipmask, 2)) map_texture_w<1>(offset - 0x0800000, data, mem_mask); break; - case 0xc000000 >> 19: case 0xc800000 >> 19: case 0xd000000 >> 19: case 0xd800000 >> 19: - case 0xe000000 >> 19: case 0xe800000 >> 19: case 0xf000000 >> 19: case 0xf800000 >> 19: + case 0xc000000 >> 19: case 0xc800000 >> 19: case 0xd000000 >> 19: case 0xd800000 >> 19: + case 0xe000000 >> 19: case 0xe800000 >> 19: case 0xf000000 >> 19: case 0xf800000 >> 19: map_yuv_w(offset - 0xc000000/4, data, mem_mask); break; - case 0x1000000 >> 19: case 0x1080000 >> 19: case 0x1100000 >> 19: case 0x1180000 >> 19: - case 0x1200000 >> 19: case 0x1280000 >> 19: case 0x1300000 >> 19: case 0x1380000 >> 19: - case 0x1400000 >> 19: case 0x1480000 >> 19: case 0x1500000 >> 19: case 0x1580000 >> 19: - case 0x1600000 >> 19: case 0x1680000 >> 19: case 0x1700000 >> 19: case 0x1780000 >> 19: - case 0x1800000 >> 19: case 0x1880000 >> 19: case 0x1900000 >> 19: case 0x1980000 >> 19: - case 0x1a00000 >> 19: case 0x1a80000 >> 19: case 0x1b00000 >> 19: case 0x1b80000 >> 19: - case 0x1c00000 >> 19: case 0x1c80000 >> 19: case 0x1d00000 >> 19: case 0x1d80000 >> 19: - case 0x1e00000 >> 19: case 0x1e80000 >> 19: case 0x1f00000 >> 19: case 0x1f80000 >> 19: + case 0x1000000 >> 19: case 0x1080000 >> 19: case 0x1100000 >> 19: case 0x1180000 >> 19: + case 0x1200000 >> 19: case 0x1280000 >> 19: case 0x1300000 >> 19: case 0x1380000 >> 19: + case 0x1400000 >> 19: case 0x1480000 >> 19: case 0x1500000 >> 19: case 0x1580000 >> 19: + case 0x1600000 >> 19: case 0x1680000 >> 19: case 0x1700000 >> 19: case 0x1780000 >> 19: + case 0x1800000 >> 19: case 0x1880000 >> 19: case 0x1900000 >> 19: case 0x1980000 >> 19: + case 0x1a00000 >> 19: case 0x1a80000 >> 19: case 0x1b00000 >> 19: case 0x1b80000 >> 19: + case 0x1c00000 >> 19: case 0x1c80000 >> 19: case 0x1d00000 >> 19: case 0x1d80000 >> 19: + case 0x1e00000 >> 19: case 0x1e80000 >> 19: case 0x1f00000 >> 19: case 0x1f80000 >> 19: map_lfb_w(offset - 0x1000000/4, data, mem_mask); break; diff --git a/src/devices/video/voodoo_regs.h b/src/devices/video/voodoo_regs.h index 4a534bb17cb..ba3582acb58 100644 --- a/src/devices/video/voodoo_regs.h +++ b/src/devices/video/voodoo_regs.h @@ -90,7 +90,7 @@ public: constexpr u32 cca_subpixel_adjust() const { return BIT(m_value, 26, 1); } constexpr u32 texture_enable() const { return BIT(m_value, 27, 1); } constexpr u32 rgbzw_clamp() const { return BIT(m_value, 28, 1); } - constexpr u32 antialias() const { return BIT(m_value, 29, 1); } // not implemented + constexpr u32 antialias() const { return BIT(m_value, 29, 1); } // not implemented constexpr u32 normalize() { @@ -135,7 +135,7 @@ public: constexpr u32 enable_alpha_planes() const { return BIT(m_value, 18, 1); } constexpr u32 alpha_dither_subtract() const { return BIT(m_value, 19, 1); } constexpr u32 depth_source_compare() const { return BIT(m_value, 20, 1); } - constexpr u32 depth_float_select() const { return BIT(m_value, 21, 1); } // voodoo 2 only + constexpr u32 depth_float_select() const { return BIT(m_value, 21, 1); } // voodoo 2 only constexpr u32 normalize() { @@ -165,7 +165,7 @@ public: constexpr u32 alphatest() const { return BIT(m_value, 0, 1); } constexpr u32 alphafunction() const { return BIT(m_value, 1, 3); } constexpr u32 alphablend() const { return BIT(m_value, 4, 1); } - constexpr u32 antialias() const { return BIT(m_value, 5, 1); } // not implemented + constexpr u32 antialias() const { return BIT(m_value, 5, 1); } // not implemented constexpr u32 srcrgbblend() const { return BIT(m_value, 8, 4); } constexpr u32 dstrgbblend() const { return BIT(m_value, 12, 4); } constexpr u32 srcalphablend() const { return BIT(m_value, 16, 4); } @@ -212,8 +212,8 @@ public: constexpr u32 fog_mult() const { return BIT(m_value, 2, 1); } constexpr u32 fog_zalpha() const { return BIT(m_value, 3, 2); } constexpr u32 fog_constant() const { return BIT(m_value, 5, 1); } - constexpr u32 fog_dither() const { return BIT(m_value, 6, 1); } // voodoo 2 only - constexpr u32 fog_zones() const { return BIT(m_value, 7, 1); } // voodoo 2 only + constexpr u32 fog_dither() const { return BIT(m_value, 6, 1); } // voodoo 2 only + constexpr u32 fog_zones() const { return BIT(m_value, 7, 1); } // voodoo 2 only constexpr u32 normalize() { @@ -272,8 +272,8 @@ public: constexpr u32 tca_reverse_blend() const { return BIT(m_value, 26, 1); } constexpr u32 tca_add_aclocal() const { return BIT(m_value, 27, 2); } constexpr u32 tca_invert_output() const { return BIT(m_value, 29, 1); } - constexpr u32 trilinear() const { return BIT(m_value, 30, 1); } // not implemented - constexpr u32 seq_8_downld() const { return BIT(m_value, 31, 1); } // repurposed as send_config + constexpr u32 trilinear() const { return BIT(m_value, 30, 1); } // not implemented + constexpr u32 seq_8_downld() const { return BIT(m_value, 31, 1); } // repurposed as send_config constexpr u32 normalize() { @@ -450,13 +450,13 @@ public: constexpr u32 snoop1_readwrite_match() const { return BIT(m_value, 9, 1); } constexpr u32 sli_bus_owner() const { return BIT(m_value, 10, 1); } constexpr u32 sli_odd_even() const { return BIT(m_value, 11, 1); } - constexpr u32 secondary_rev_id() const { return BIT(m_value, 12, 4); } // voodoo 2 only - constexpr u32 mfctr_fab_id() const { return BIT(m_value, 16, 4); } // voodoo 2 only - constexpr u32 enable_pci_interrupt() const { return BIT(m_value, 20, 1); } // voodoo 2 only - constexpr u32 pci_interrupt_timeout() const { return BIT(m_value, 21, 1); } // voodoo 2 only - constexpr u32 enable_nand_tree_test() const { return BIT(m_value, 22, 1); } // voodoo 2 only - constexpr u32 enable_sli_address_snoop() const { return BIT(m_value, 23, 1); } // voodoo 2 only - constexpr u32 sli_snoop_address() const { return BIT(m_value, 24, 8); } // voodoo 2 only + constexpr u32 secondary_rev_id() const { return BIT(m_value, 12, 4); } // voodoo 2 only + constexpr u32 mfctr_fab_id() const { return BIT(m_value, 16, 4); } // voodoo 2 only + constexpr u32 enable_pci_interrupt() const { return BIT(m_value, 20, 1); } // voodoo 2 only + constexpr u32 pci_interrupt_timeout() const { return BIT(m_value, 21, 1); } // voodoo 2 only + constexpr u32 enable_nand_tree_test() const { return BIT(m_value, 22, 1); } // voodoo 2 only + constexpr u32 enable_sli_address_snoop() const { return BIT(m_value, 23, 1); } // voodoo 2 only + constexpr u32 sli_snoop_address() const { return BIT(m_value, 24, 8); } // voodoo 2 only private: u32 m_value; @@ -498,7 +498,7 @@ public: constexpr u32 pci_dev_function() const { return BIT(m_value, 0, 1); } constexpr u32 pci_write_wait_states() const { return BIT(m_value, 1, 1); } - constexpr u32 multi_sst1() const { return BIT(m_value, 2, 1); } // not on voodoo 2 + constexpr u32 multi_sst1() const { return BIT(m_value, 2, 1); } // not on voodoo 2 constexpr u32 enable_lfb() const { return BIT(m_value, 3, 1); } constexpr u32 x_video_tiles() const { return BIT(m_value, 4, 4); } constexpr u32 video_timing_reset() const { return BIT(m_value, 8, 1); } @@ -515,7 +515,7 @@ public: constexpr u32 video_timing_source() const { return BIT(m_value, 20, 2); } constexpr u32 enable_24bpp_output() const { return BIT(m_value, 22, 1); } constexpr u32 enable_sli() const { return BIT(m_value, 23, 1); } - constexpr u32 x_video_tiles_bit5() const { return BIT(m_value, 24, 1); } // voodoo 2 only + constexpr u32 x_video_tiles_bit5() const { return BIT(m_value, 24, 1); } // voodoo 2 only constexpr u32 enable_edge_filter() const { return BIT(m_value, 25, 1); } constexpr u32 invert_vid_clk_2x() const { return BIT(m_value, 26, 1); } constexpr u32 vid_clk_2x_sel_delay() const { return BIT(m_value, 27, 2); } @@ -590,7 +590,7 @@ public: constexpr u32 memory_fifo_lwm() const { return BIT(m_value, 2, 6); } constexpr u32 memory_fifo_start_row() const { return BIT(m_value, 8, 10); } constexpr u32 memory_fifo_stop_row() const { return BIT(m_value, 18, 10); } - constexpr u32 video_clocking_delay() const { return BIT(m_value, 29, 7); } // voodoo 2 only + constexpr u32 video_clocking_delay() const { return BIT(m_value, 29, 7); } // voodoo 2 only private: u32 m_value; @@ -605,31 +605,31 @@ public: constexpr reg_fbi_init5(u32 value) : m_value(value) { } - constexpr u32 disable_pci_stop() const { return BIT(m_value, 0, 1); } // voodoo 2 only - constexpr u32 pci_slave_speed() const { return BIT(m_value, 1, 1); } // voodoo 2 only - constexpr u32 dac_data_output_width() const { return BIT(m_value, 2, 1); } // voodoo 2 only - constexpr u32 dac_data_17_output() const { return BIT(m_value, 3, 1); } // voodoo 2 only - constexpr u32 dac_data_18_output() const { return BIT(m_value, 4, 1); } // voodoo 2 only - constexpr u32 generic_strapping() const { return BIT(m_value, 5, 4); } // voodoo 2 only - constexpr u32 buffer_allocation() const { return BIT(m_value, 9, 2); } // voodoo 2 only - constexpr u32 drive_vid_clk_slave() const { return BIT(m_value, 11, 1); } // voodoo 2 only - constexpr u32 drive_dac_data_16() const { return BIT(m_value, 12, 1); } // voodoo 2 only - constexpr u32 vclk_input_select() const { return BIT(m_value, 13, 1); } // voodoo 2 only - constexpr u32 multi_cvg_detect() const { return BIT(m_value, 14, 1); } // voodoo 2 only - constexpr u32 sync_retrace_reads() const { return BIT(m_value, 15, 1); } // voodoo 2 only - constexpr u32 enable_rhborder_color() const { return BIT(m_value, 16, 1); } // voodoo 2 only - constexpr u32 enable_lhborder_color() const { return BIT(m_value, 17, 1); } // voodoo 2 only - constexpr u32 enable_bvborder_color() const { return BIT(m_value, 18, 1); } // voodoo 2 only - constexpr u32 enable_tvborder_color() const { return BIT(m_value, 19, 1); } // voodoo 2 only - constexpr u32 double_horiz() const { return BIT(m_value, 20, 1); } // voodoo 2 only - constexpr u32 double_vert() const { return BIT(m_value, 21, 1); } // voodoo 2 only - constexpr u32 enable_16bit_gamma() const { return BIT(m_value, 22, 1); } // voodoo 2 only - constexpr u32 invert_dac_hsync() const { return BIT(m_value, 23, 1); } // voodoo 2 only - constexpr u32 invert_dac_vsync() const { return BIT(m_value, 24, 1); } // voodoo 2 only - constexpr u32 enable_24bit_dacdata() const { return BIT(m_value, 25, 1); } // voodoo 2 only - constexpr u32 enable_interlacing() const { return BIT(m_value, 26, 1); } // voodoo 2 only - constexpr u32 dac_data_18_control() const { return BIT(m_value, 27, 1); } // voodoo 2 only - constexpr u32 rasterizer_unit_mode() const { return BIT(m_value, 30, 2); } // voodoo 2 only + constexpr u32 disable_pci_stop() const { return BIT(m_value, 0, 1); } // voodoo 2 only + constexpr u32 pci_slave_speed() const { return BIT(m_value, 1, 1); } // voodoo 2 only + constexpr u32 dac_data_output_width() const { return BIT(m_value, 2, 1); } // voodoo 2 only + constexpr u32 dac_data_17_output() const { return BIT(m_value, 3, 1); } // voodoo 2 only + constexpr u32 dac_data_18_output() const { return BIT(m_value, 4, 1); } // voodoo 2 only + constexpr u32 generic_strapping() const { return BIT(m_value, 5, 4); } // voodoo 2 only + constexpr u32 buffer_allocation() const { return BIT(m_value, 9, 2); } // voodoo 2 only + constexpr u32 drive_vid_clk_slave() const { return BIT(m_value, 11, 1); } // voodoo 2 only + constexpr u32 drive_dac_data_16() const { return BIT(m_value, 12, 1); } // voodoo 2 only + constexpr u32 vclk_input_select() const { return BIT(m_value, 13, 1); } // voodoo 2 only + constexpr u32 multi_cvg_detect() const { return BIT(m_value, 14, 1); } // voodoo 2 only + constexpr u32 sync_retrace_reads() const { return BIT(m_value, 15, 1); } // voodoo 2 only + constexpr u32 enable_rhborder_color() const { return BIT(m_value, 16, 1); } // voodoo 2 only + constexpr u32 enable_lhborder_color() const { return BIT(m_value, 17, 1); } // voodoo 2 only + constexpr u32 enable_bvborder_color() const { return BIT(m_value, 18, 1); } // voodoo 2 only + constexpr u32 enable_tvborder_color() const { return BIT(m_value, 19, 1); } // voodoo 2 only + constexpr u32 double_horiz() const { return BIT(m_value, 20, 1); } // voodoo 2 only + constexpr u32 double_vert() const { return BIT(m_value, 21, 1); } // voodoo 2 only + constexpr u32 enable_16bit_gamma() const { return BIT(m_value, 22, 1); } // voodoo 2 only + constexpr u32 invert_dac_hsync() const { return BIT(m_value, 23, 1); } // voodoo 2 only + constexpr u32 invert_dac_vsync() const { return BIT(m_value, 24, 1); } // voodoo 2 only + constexpr u32 enable_24bit_dacdata() const { return BIT(m_value, 25, 1); } // voodoo 2 only + constexpr u32 enable_interlacing() const { return BIT(m_value, 26, 1); } // voodoo 2 only + constexpr u32 dac_data_18_control() const { return BIT(m_value, 27, 1); } // voodoo 2 only + constexpr u32 rasterizer_unit_mode() const { return BIT(m_value, 30, 2); } // voodoo 2 only private: u32 m_value; @@ -644,18 +644,18 @@ public: constexpr reg_fbi_init6(u32 value) : m_value(value) { } - constexpr u32 window_active_counter() const { return BIT(m_value, 0, 3); } // voodoo 2 only - constexpr u32 window_drag_counter() const { return BIT(m_value, 3, 5); } // voodoo 2 only - constexpr u32 sli_sync_master() const { return BIT(m_value, 8, 1); } // voodoo 2 only - constexpr u32 dac_data_22_output() const { return BIT(m_value, 9, 2); } // voodoo 2 only - constexpr u32 dac_data_23_output() const { return BIT(m_value, 11, 2); } // voodoo 2 only - constexpr u32 sli_syncin_output() const { return BIT(m_value, 13, 2); } // voodoo 2 only - constexpr u32 sli_syncout_output() const { return BIT(m_value, 15, 2); } // voodoo 2 only - constexpr u32 dac_rd_output() const { return BIT(m_value, 17, 2); } // voodoo 2 only - constexpr u32 dac_wr_output() const { return BIT(m_value, 19, 2); } // voodoo 2 only - constexpr u32 pci_fifo_lwm_rdy() const { return BIT(m_value, 21, 7); } // voodoo 2 only - constexpr u32 vga_pass_n_output() const { return BIT(m_value, 28, 2); } // voodoo 2 only - constexpr u32 x_video_tiles_bit0() const { return BIT(m_value, 30, 1); } // voodoo 2 only + constexpr u32 window_active_counter() const { return BIT(m_value, 0, 3); } // voodoo 2 only + constexpr u32 window_drag_counter() const { return BIT(m_value, 3, 5); } // voodoo 2 only + constexpr u32 sli_sync_master() const { return BIT(m_value, 8, 1); } // voodoo 2 only + constexpr u32 dac_data_22_output() const { return BIT(m_value, 9, 2); } // voodoo 2 only + constexpr u32 dac_data_23_output() const { return BIT(m_value, 11, 2); } // voodoo 2 only + constexpr u32 sli_syncin_output() const { return BIT(m_value, 13, 2); } // voodoo 2 only + constexpr u32 sli_syncout_output() const { return BIT(m_value, 15, 2); } // voodoo 2 only + constexpr u32 dac_rd_output() const { return BIT(m_value, 17, 2); } // voodoo 2 only + constexpr u32 dac_wr_output() const { return BIT(m_value, 19, 2); } // voodoo 2 only + constexpr u32 pci_fifo_lwm_rdy() const { return BIT(m_value, 21, 7); } // voodoo 2 only + constexpr u32 vga_pass_n_output() const { return BIT(m_value, 28, 2); } // voodoo 2 only + constexpr u32 x_video_tiles_bit0() const { return BIT(m_value, 30, 1); } // voodoo 2 only private: u32 m_value; @@ -670,17 +670,17 @@ public: constexpr reg_fbi_init7(u32 value) : m_value(value) { } - constexpr u32 generic_strapping() const { return BIT(m_value, 0, 8); } // voodoo 2 only - constexpr u32 cmdfifo_enable() const { return BIT(m_value, 8, 1); } // voodoo 2 only - constexpr u32 cmdfifo_memory_store() const { return BIT(m_value, 9, 1); } // voodoo 2 only - constexpr u32 disable_cmdfifo_holes() const { return BIT(m_value, 10, 1); } // voodoo 2 only - constexpr u32 cmdfifo_read_thresh() const { return BIT(m_value, 11, 5); } // voodoo 2 only - constexpr u32 sync_cmdfifo_writes() const { return BIT(m_value, 16, 1); } // voodoo 2 only - constexpr u32 sync_cmdfifo_reads() const { return BIT(m_value, 17, 1); } // voodoo 2 only - constexpr u32 reset_pci_packer() const { return BIT(m_value, 18, 1); } // voodoo 2 only - constexpr u32 enable_chroma_stuff() const { return BIT(m_value, 19, 1); } // voodoo 2 only - constexpr u32 cmdfifo_pci_timeout() const { return BIT(m_value, 20, 7); } // voodoo 2 only - constexpr u32 enable_texture_burst() const { return BIT(m_value, 27, 1); } // voodoo 2 only + constexpr u32 generic_strapping() const { return BIT(m_value, 0, 8); } // voodoo 2 only + constexpr u32 cmdfifo_enable() const { return BIT(m_value, 8, 1); } // voodoo 2 only + constexpr u32 cmdfifo_memory_store() const { return BIT(m_value, 9, 1); } // voodoo 2 only + constexpr u32 disable_cmdfifo_holes() const { return BIT(m_value, 10, 1); } // voodoo 2 only + constexpr u32 cmdfifo_read_thresh() const { return BIT(m_value, 11, 5); } // voodoo 2 only + constexpr u32 sync_cmdfifo_writes() const { return BIT(m_value, 16, 1); } // voodoo 2 only + constexpr u32 sync_cmdfifo_reads() const { return BIT(m_value, 17, 1); } // voodoo 2 only + constexpr u32 reset_pci_packer() const { return BIT(m_value, 18, 1); } // voodoo 2 only + constexpr u32 enable_chroma_stuff() const { return BIT(m_value, 19, 1); } // voodoo 2 only + constexpr u32 cmdfifo_pci_timeout() const { return BIT(m_value, 20, 7); } // voodoo 2 only + constexpr u32 enable_texture_burst() const { return BIT(m_value, 27, 1); } // voodoo 2 only private: u32 m_value; diff --git a/src/devices/video/voodoo_render.cpp b/src/devices/video/voodoo_render.cpp index 756dff823c2..eaa85062a5f 100644 --- a/src/devices/video/voodoo_render.cpp +++ b/src/devices/video/voodoo_render.cpp @@ -2633,94 +2633,94 @@ void voodoo_renderer::reset_after_wait() static_rasterizer_info s_predef_raster_table[] = { // wg3dh - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x000000DF, 0xFFFFFFFF ) // 3286099 20381549 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000009F, 0xFFFFFFFF ) // 2489030 17200373 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 3014599 13488668 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x000000DF, 0xFFFFFFFF ) // 3286099 20381549 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000009F, 0xFFFFFFFF ) // 2489030 17200373 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 3014599 13488668 // RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 698012 11525474 // RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x00000ADF, 0xFFFFFFFF ) // 119292 6768046 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000081F, 0xFFFFFFFF ) // 218912 6316948 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000089F, 0xFFFFFFFF ) // 176840 6033269 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000005F, 0xFFFFFFFF ) // 272493 1528924 - RASTERIZER( 0x05, 0x00480035, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 11590 1026235 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000081F, 0xFFFFFFFF ) // 218912 6316948 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000089F, 0xFFFFFFFF ) // 176840 6033269 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x0000005F, 0xFFFFFFFF ) // 272493 1528924 + RASTERIZER( 0x05, 0x00480035, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 11590 1026235 // mace - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 6375980 96752762 - RASTERIZER( 0x05, 0x00602401, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 877666 12853963 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 537316 12467938 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 674113 11249705 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 371317 9571618 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000008F, 0xFFFFFFFF ) // 682233 9124733 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x000000CF, 0xFFFFFFFF ) // 498471 8420845 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 90032 5376303 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0379, 0x0000080F, 0xFFFFFFFF ) // 107465 5176593 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x00000ADF, 0xFFFFFFFF ) // 13184 5007304 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 6375980 96752762 + RASTERIZER( 0x05, 0x00602401, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 877666 12853963 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 537316 12467938 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 674113 11249705 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 371317 9571618 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000008F, 0xFFFFFFFF ) // 682233 9124733 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x000000CF, 0xFFFFFFFF ) // 498471 8420845 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 90032 5376303 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0379, 0x0000080F, 0xFFFFFFFF ) // 107465 5176593 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x00000ADF, 0xFFFFFFFF ) // 13184 5007304 // sfrush - RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000001F ) // 1355672 19357520 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 1297788 14089416 - RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000081F ) // 607380 12402671 - RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x00000000, 0x0000001F ) // 665621 10647858 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000001, 0x000B0779, 0x000000DF, 0xFFFFFFFF ) // 714734 10358977 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 708263 9010666 - RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x00000000, 0x0000081F ) // 187026 4932870 - RASTERIZER( 0x0A, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0xFFFFFFFF, 0x000000DF ) // 45383 4310253 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000081F, 0xFFFFFFFF ) // 308972 3302296 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0379, 0x0000001F, 0xFFFFFFFF ) // 285502 2946170 - RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x082708DF, 0x0000001F ) // 443667 2634580 + RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000001F ) // 1355672 19357520 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 1297788 14089416 + RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000081F ) // 607380 12402671 + RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x00000000, 0x0000001F ) // 665621 10647858 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000001, 0x000B0779, 0x000000DF, 0xFFFFFFFF ) // 714734 10358977 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 708263 9010666 + RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x00000000, 0x0000081F ) // 187026 4932870 + RASTERIZER( 0x0A, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0xFFFFFFFF, 0x000000DF ) // 45383 4310253 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000081F, 0xFFFFFFFF ) // 308972 3302296 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0379, 0x0000001F, 0xFFFFFFFF ) // 285502 2946170 + RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x082708DF, 0x0000001F ) // 443667 2634580 // RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 112446 2477427 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000081F, 0xFFFFFFFF ) // 195197 2339499 - RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x082708DF, 0x0000001F ) // 365543 2303916 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000081F, 0xFFFFFFFF ) // 195197 2339499 + RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x082708DF, 0x0000001F ) // 365543 2303916 // sfrushrk // RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x00000000, 0x0000001F ) // 1419527 23908786 // RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 963906 14481970 - RASTERIZER( 0x0A, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0xFFFFFFFF, 0x0000001F ) // 174421 10184608 + RASTERIZER( 0x0A, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0xFFFFFFFF, 0x0000001F ) // 174421 10184608 // RASTERIZER( 0x0B, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x00000000, 0x0000081F ) // 384547 7885615 // RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000001, 0x000B0779, 0x000000DF, 0xFFFFFFFF ) // 244858 4208409 - RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 206798 3960712 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000001, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 153642 3621111 + RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 206798 3960712 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000001, 0x000B0779, 0x000008DF, 0xFFFFFFFF ) // 153642 3621111 // RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000001F, 0xFFFFFFFF ) // 108089 3590760 // RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0x0000081F, 0xFFFFFFFF ) // 219585 2909829 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000001, 0x000B0379, 0x0000001F, 0xFFFFFFFF ) // 187042 2805524 - RASTERIZER( 0x0A, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0xFFFFFFFF, 0x000000DF ) // 25554 2515514 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000001, 0x000B0379, 0x0000001F, 0xFFFFFFFF ) // 187042 2805524 + RASTERIZER( 0x0A, 0x00600C09, 0x00045119, 0x00000001, 0x000B0779, 0xFFFFFFFF, 0x000000DF ) // 25554 2515514 // calspeed - RASTERIZER( 0x05, 0x01022819, 0x00000009, 0x00000001, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 4701502 50735847 - RASTERIZER( 0x05, 0x01022819, 0x00000009, 0x00000001, 0x000B073B, 0x0000000F, 0xFFFFFFFF ) // 1634191 24047354 - RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B0739, 0x0000080F, 0xFFFFFFFF ) // 742857 14056518 - RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 1299926 12893822 - RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B07F9, 0x0000080F, 0xFFFFFFFF ) // 543774 11318818 - RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B07F9, 0x0000000F, 0xFFFFFFFF ) // 40320 5118555 - RASTERIZER( 0x05, 0x01022C19, 0x00000009, 0x00000001, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 227824 3146670 - RASTERIZER( 0x05, 0x01022C19, 0x00000009, 0x00000001, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 35644 2681027 - RASTERIZER( 0x00, 0x0102001A, 0x00045119, 0x00000001, 0x000A0321, 0xFFFFFFFF, 0xFFFFFFFF ) // 24976 2363490 - RASTERIZER( 0x05, 0x00602819, 0x00045119, 0x00000001, 0x000B07F9, 0x0000080F, 0xFFFFFFFF ) // 28316 2004570 + RASTERIZER( 0x05, 0x01022819, 0x00000009, 0x00000001, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 4701502 50735847 + RASTERIZER( 0x05, 0x01022819, 0x00000009, 0x00000001, 0x000B073B, 0x0000000F, 0xFFFFFFFF ) // 1634191 24047354 + RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B0739, 0x0000080F, 0xFFFFFFFF ) // 742857 14056518 + RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 1299926 12893822 + RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B07F9, 0x0000080F, 0xFFFFFFFF ) // 543774 11318818 + RASTERIZER( 0x05, 0x00002815, 0x00045119, 0x00000001, 0x000B07F9, 0x0000000F, 0xFFFFFFFF ) // 40320 5118555 + RASTERIZER( 0x05, 0x01022C19, 0x00000009, 0x00000001, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 227824 3146670 + RASTERIZER( 0x05, 0x01022C19, 0x00000009, 0x00000001, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 35644 2681027 + RASTERIZER( 0x00, 0x0102001A, 0x00045119, 0x00000001, 0x000A0321, 0xFFFFFFFF, 0xFFFFFFFF ) // 24976 2363490 + RASTERIZER( 0x05, 0x00602819, 0x00045119, 0x00000001, 0x000B07F9, 0x0000080F, 0xFFFFFFFF ) // 28316 2004570 // vaportrx - RASTERIZER( 0x05, 0x00482405, 0x00000000, 0x00000000, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 1446198 21480806 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0739, 0x000000CF, 0xFFFFFFFF ) // 1707856 9876920 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B07F9, 0x000000C9, 0xFFFFFFFF ) // 739894 9863144 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0339, 0x00000ACF, 0xFFFFFFFF ) // 460944 9848421 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B07F9, 0x00000ACF, 0xFFFFFFFF ) // 219658 4982710 - RASTERIZER( 0x05, 0x00482405, 0x00000009, 0x00000000, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 268313 4748332 - RASTERIZER( 0x05, 0x00482435, 0x00000000, 0x00000000, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 283627 3457853 - RASTERIZER( 0x05, 0x00482435, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 34206 2494986 - RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x00000000, 0x000B0339, 0x0000000F, 0xFFFFFFFF ) // 153391 2048929 + RASTERIZER( 0x05, 0x00482405, 0x00000000, 0x00000000, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 1446198 21480806 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0739, 0x000000CF, 0xFFFFFFFF ) // 1707856 9876920 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B07F9, 0x000000C9, 0xFFFFFFFF ) // 739894 9863144 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0339, 0x00000ACF, 0xFFFFFFFF ) // 460944 9848421 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B07F9, 0x00000ACF, 0xFFFFFFFF ) // 219658 4982710 + RASTERIZER( 0x05, 0x00482405, 0x00000009, 0x00000000, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 268313 4748332 + RASTERIZER( 0x05, 0x00482435, 0x00000000, 0x00000000, 0x000B0739, 0x0000000F, 0xFFFFFFFF ) // 283627 3457853 + RASTERIZER( 0x05, 0x00482435, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 34206 2494986 + RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x00000000, 0x000B0339, 0x0000000F, 0xFFFFFFFF ) // 153391 2048929 // blitz - RASTERIZER( 0x05, 0x00002C35, 0x00515119, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 5465143 29568854 - RASTERIZER( 0x05, 0x00002C35, 0x00515110, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 671263 19501211 - RASTERIZER( 0x05, 0x00000035, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 239790 17412073 - RASTERIZER( 0x05, 0x01422439, 0x00000000, 0x00000000, 0x000B073B, 0x000000C9, 0xFFFFFFFF ) // 1174048 13394869 - RASTERIZER( 0x05, 0x00002C35, 0x00515119, 0x00000000, 0x000B0799, 0x00000A0F, 0xFFFFFFFF ) // 781255 6391702 - RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 47802 3412779 - RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 79490 3088491 - RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 15232 2566323 - RASTERIZER( 0x05, 0x00002C35, 0x00515119, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 177716 2320638 - RASTERIZER( 0x05, 0x00006136, 0x00515119, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 18686 1741744 + RASTERIZER( 0x05, 0x00002C35, 0x00515119, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 5465143 29568854 + RASTERIZER( 0x05, 0x00002C35, 0x00515110, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 671263 19501211 + RASTERIZER( 0x05, 0x00000035, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 239790 17412073 + RASTERIZER( 0x05, 0x01422439, 0x00000000, 0x00000000, 0x000B073B, 0x000000C9, 0xFFFFFFFF ) // 1174048 13394869 + RASTERIZER( 0x05, 0x00002C35, 0x00515119, 0x00000000, 0x000B0799, 0x00000A0F, 0xFFFFFFFF ) // 781255 6391702 + RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 47802 3412779 + RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 79490 3088491 + RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 15232 2566323 + RASTERIZER( 0x05, 0x00002C35, 0x00515119, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 177716 2320638 + RASTERIZER( 0x05, 0x00006136, 0x00515119, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 18686 1741744 // blitz99 - RASTERIZER( 0x05, 0x00000035, 0x00000009, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 5757356 35675229 + RASTERIZER( 0x05, 0x00000035, 0x00000009, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 5757356 35675229 // RASTERIZER( 0x05, 0x00000035, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 270977 16139833 // RASTERIZER( 0x05, 0x00002C35, 0x64515119, 0x00000000, 0x000B0799, 0x00000A0F, 0xFFFFFFFF ) // 869068 7819874 // RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 57874 5309214 @@ -2729,7 +2729,7 @@ static_rasterizer_info s_predef_raster_table[] = // RASTERIZER( 0x05, 0x00002C35, 0x40515119, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 92655 1928223 // RASTERIZER( 0x05, 0x00002C35, 0x40515119, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 131380 1908198 // RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 86764 1760469 - RASTERIZER( 0x05, 0x00000035, 0x00000009, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 189197 1504639 + RASTERIZER( 0x05, 0x00000035, 0x00000009, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 189197 1504639 // blitz2k // RASTERIZER( 0x05, 0x00000035, 0x00000009, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 5486749 33668808 @@ -2737,164 +2737,164 @@ static_rasterizer_info s_predef_raster_table[] = // RASTERIZER( 0x05, 0x00002C35, 0x00515119, 0x00000000, 0x000B0799, 0x00000A0F, 0xFFFFFFFF ) // 801050 7476260 // RASTERIZER( 0x05, 0x01422439, 0x00000000, 0x00000000, 0x000B073B, 0x000000C9, 0xFFFFFFFF ) // 461364 5981963 // RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 93786 5079967 - RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000000, 0x000B073B, 0x00000ACF, 0xFFFFFFFF ) // 16252 2943314 - RASTERIZER( 0x05, 0x00002C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 200589 2563939 + RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000000, 0x000B073B, 0x00000ACF, 0xFFFFFFFF ) // 16252 2943314 + RASTERIZER( 0x05, 0x00002C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 200589 2563939 // RASTERIZER( 0x05, 0x00006136, 0x00515119, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 18221 2335412 // RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 90486 2212467 // carnevil - RASTERIZER( 0x05, 0x00002425, 0x00045119, 0x00000000, 0x00030679, 0x00000A0F, 0xFFFFFFFF ) // 420627 4298755 - RASTERIZER( 0x05, 0x00002435, 0x00045119, 0x00000000, 0x000302F9, 0x0000080F, 0xFFFFFFFF ) // 112660 2916676 - RASTERIZER( 0x05, 0x00002435, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 36468 735846 - RASTERIZER( 0x05, 0x00000035, 0x08045119, 0x00000000, 0x000306F9, 0x00000AC9, 0xFFFFFFFF ) // 6996 212717 - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x00030679, 0x00000A0F, 0xFFFFFFFF ) // 754 190433 + RASTERIZER( 0x05, 0x00002425, 0x00045119, 0x00000000, 0x00030679, 0x00000A0F, 0xFFFFFFFF ) // 420627 4298755 + RASTERIZER( 0x05, 0x00002435, 0x00045119, 0x00000000, 0x000302F9, 0x0000080F, 0xFFFFFFFF ) // 112660 2916676 + RASTERIZER( 0x05, 0x00002435, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 36468 735846 + RASTERIZER( 0x05, 0x00000035, 0x08045119, 0x00000000, 0x000306F9, 0x00000AC9, 0xFFFFFFFF ) // 6996 212717 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x00000000, 0x00030679, 0x00000A0F, 0xFFFFFFFF ) // 754 190433 // hyprdriv - RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 146568 18142019 - RASTERIZER( 0x05, 0x01422C19, 0x00000000, 0x00000001, 0x000B073B, 0x00000A0F, 0xFFFFFFFF ) // 771521 12744098 - RASTERIZER( 0x05, 0x00582435, 0x00515110, 0x00000001, 0x000B0739, 0x00000AC9, 0xFFFFFFFF ) // 997666 12173827 - RASTERIZER( 0x00, 0x0142612A, 0x00000000, 0x00000001, 0x000B0739, 0xFFFFFFFF, 0xFFFFFFFF ) // 2064812 11818083 - RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 67518 8476957 - RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B073B, 0x00000A0F, 0xFFFFFFFF ) // 3404038 8059738 - RASTERIZER( 0x00, 0x0142611A, 0x00045110, 0x00000001, 0x000B0739, 0xFFFFFFFF, 0xFFFFFFFF ) // 797160 3625519 - RASTERIZER( 0x05, 0x01422429, 0x00000000, 0x00000001, 0x000B073B, 0x00000A1F, 0xFFFFFFFF ) // 154937 3337816 - RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000001, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 19770 2887063 - RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B073B, 0x0000000F, 0xFFFFFFFF ) // 392772 2654749 - RASTERIZER( 0x05, 0x01422429, 0x00000000, 0x00000001, 0x000B073B, 0x0000001F, 0xFFFFFFFF ) // 101694 2333476 - RASTERIZER( 0x05, 0x00580035, 0x00000000, 0x00000001, 0x000B073B, 0x00000A1F, 0xFFFFFFFF ) // 152748 2258208 - RASTERIZER( 0x05, 0x00580035, 0x00000000, 0x00000001, 0x000B073B, 0x0000001F, 0xFFFFFFFF ) // 164822 2100196 + RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 146568 18142019 + RASTERIZER( 0x05, 0x01422C19, 0x00000000, 0x00000001, 0x000B073B, 0x00000A0F, 0xFFFFFFFF ) // 771521 12744098 + RASTERIZER( 0x05, 0x00582435, 0x00515110, 0x00000001, 0x000B0739, 0x00000AC9, 0xFFFFFFFF ) // 997666 12173827 + RASTERIZER( 0x00, 0x0142612A, 0x00000000, 0x00000001, 0x000B0739, 0xFFFFFFFF, 0xFFFFFFFF ) // 2064812 11818083 + RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 67518 8476957 + RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B073B, 0x00000A0F, 0xFFFFFFFF ) // 3404038 8059738 + RASTERIZER( 0x00, 0x0142611A, 0x00045110, 0x00000001, 0x000B0739, 0xFFFFFFFF, 0xFFFFFFFF ) // 797160 3625519 + RASTERIZER( 0x05, 0x01422429, 0x00000000, 0x00000001, 0x000B073B, 0x00000A1F, 0xFFFFFFFF ) // 154937 3337816 + RASTERIZER( 0x05, 0x00582C35, 0x00515110, 0x00000001, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 19770 2887063 + RASTERIZER( 0x05, 0x01420039, 0x00000000, 0x00000001, 0x000B073B, 0x0000000F, 0xFFFFFFFF ) // 392772 2654749 + RASTERIZER( 0x05, 0x01422429, 0x00000000, 0x00000001, 0x000B073B, 0x0000001F, 0xFFFFFFFF ) // 101694 2333476 + RASTERIZER( 0x05, 0x00580035, 0x00000000, 0x00000001, 0x000B073B, 0x00000A1F, 0xFFFFFFFF ) // 152748 2258208 + RASTERIZER( 0x05, 0x00580035, 0x00000000, 0x00000001, 0x000B073B, 0x0000001F, 0xFFFFFFFF ) // 164822 2100196 // gauntleg - RASTERIZER( 0x0B, 0x00600039, 0x00045119, 0x00000000, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 1846512 77235960 - RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 1733863 14067084 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x0000004F, 0xFFFFFFFF ) // 1517970 13213493 + RASTERIZER( 0x0B, 0x00600039, 0x00045119, 0x00000000, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 1846512 77235960 + RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 1733863 14067084 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x0000004F, 0xFFFFFFFF ) // 1517970 13213493 // RASTERIZER( 0x05, 0x00600C09, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 2449825 12337057 - RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000000F ) // 193539 10327282 - RASTERIZER( 0x0B, 0x00600039, 0x00045119, 0x00000000, 0x000B0779, 0x0C22480F, 0x00000ACF ) // 173388 5900312 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000004F ) // 272048 5557244 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x00000A4F ) // 38452 4404158 - RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000080F ) // 93156 4365283 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x00000A4F, 0xFFFFFFFF ) // 51416 3857019 - RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 220103 2783489 + RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000000F ) // 193539 10327282 + RASTERIZER( 0x0B, 0x00600039, 0x00045119, 0x00000000, 0x000B0779, 0x0C22480F, 0x00000ACF ) // 173388 5900312 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000004F ) // 272048 5557244 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x00000A4F ) // 38452 4404158 + RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000080F ) // 93156 4365283 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x00000A4F, 0xFFFFFFFF ) // 51416 3857019 + RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 220103 2783489 // gauntdl - RASTERIZER( 0x0B, 0x0060743A, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 4613022 100488623 - RASTERIZER( 0x0B, 0x0060743A, 0x00045110, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 2989550 50643553 - RASTERIZER( 0x0B, 0x0060743A, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22480F, 0x00000ACF ) // 741940 22885885 - RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 2843876 16209403 - RASTERIZER( 0x0B, 0x0060743A, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22488F, 0x00000ACF ) // 349018 11700233 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x000000CF, 0xFFFFFFFF ) // 798144 7819799 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x00000009, 0x000008CF ) // 217622 7362228 - RASTERIZER( 0x0B, 0x00602439, 0x00044110, 0x00000000, 0x000B0379, 0x00000009, 0x0000000F ) // 111605 6859677 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x00000009, 0x00000ACF ) // 42994 6006533 - RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 1174759 5414174 - RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x00000009, 0x0000000F ) // 1358847 5366960 - RASTERIZER( 0x05, 0x00602C19, 0x00045110, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 1317912 5103516 + RASTERIZER( 0x0B, 0x0060743A, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 4613022 100488623 + RASTERIZER( 0x0B, 0x0060743A, 0x00045110, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 2989550 50643553 + RASTERIZER( 0x0B, 0x0060743A, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22480F, 0x00000ACF ) // 741940 22885885 + RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 2843876 16209403 + RASTERIZER( 0x0B, 0x0060743A, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22488F, 0x00000ACF ) // 349018 11700233 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x000000CF, 0xFFFFFFFF ) // 798144 7819799 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x00000009, 0x000008CF ) // 217622 7362228 + RASTERIZER( 0x0B, 0x00602439, 0x00044110, 0x00000000, 0x000B0379, 0x00000009, 0x0000000F ) // 111605 6859677 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x00000009, 0x00000ACF ) // 42994 6006533 + RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 1174759 5414174 + RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x00000009, 0x0000000F ) // 1358847 5366960 + RASTERIZER( 0x05, 0x00602C19, 0x00045110, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 1317912 5103516 // warfa - RASTERIZER( 0x0B, 0x00602439, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 5549270 83260187 + RASTERIZER( 0x0B, 0x00602439, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000ACF ) // 5549270 83260187 // RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 2450037 34142048 - RASTERIZER( 0x0B, 0x00602419, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000A0F ) // 1406309 22020895 - RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 3121611 13535796 - RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x00000000, 0x0000000F ) // 3821464 12671381 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x104008CF, 0x000008CF ) // 1045140 10170316 - RASTERIZER( 0x0B, 0x00602439, 0x00044119, 0x000000C1, 0x000B0779, 0x0582480F, 0x0000080F ) // 43674 7349020 + RASTERIZER( 0x0B, 0x00602419, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22400F, 0x00000A0F ) // 1406309 22020895 + RASTERIZER( 0x05, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 3121611 13535796 + RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x00000000, 0x0000000F ) // 3821464 12671381 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x104008CF, 0x000008CF ) // 1045140 10170316 + RASTERIZER( 0x0B, 0x00602439, 0x00044119, 0x000000C1, 0x000B0779, 0x0582480F, 0x0000080F ) // 43674 7349020 // RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x00000000, 0x000B0779, 0x00000000, 0x0000000F ) // 864570 6795448 - RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x00000000, 0x0000080F ) // 531132 6584618 - RASTERIZER( 0x0B, 0x00602439, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22480F, 0x00000ACF ) // 169887 6529727 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x10400ACF, 0x000008CF ) // 420204 5602132 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x104000CF, 0x000008CF ) // 306432 4918886 + RASTERIZER( 0x0B, 0x00602C19, 0x00045119, 0x000000C1, 0x000B0779, 0x00000000, 0x0000080F ) // 531132 6584618 + RASTERIZER( 0x0B, 0x00602439, 0x00045119, 0x000000C1, 0x000B0779, 0x0C22480F, 0x00000ACF ) // 169887 6529727 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x10400ACF, 0x000008CF ) // 420204 5602132 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x000000C1, 0x000B0779, 0x104000CF, 0x000008CF ) // 306432 4918886 // RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 5627690 79723246 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x00000A0F, 0xFFFFFFFF ) // 250480 17957361 - RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0x0000000F ) // 4264955 17065131 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 789463 11602094 - RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x000008CF ) // 452695 11374291 - RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x0000080F ) // 2219901 10964372 - RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x0000000F ) // 2985476 10576909 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 430488 6729680 - RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x000008CF ) // 317486 5192722 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 551185 3395443 - RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x0000088F, 0x0000080F ) // 276296 3024329 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x00000A0F, 0xFFFFFFFF ) // 250480 17957361 + RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x0000000F, 0x0000000F ) // 4264955 17065131 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 789463 11602094 + RASTERIZER( 0x0B, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x000008CF ) // 452695 11374291 + RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x0000080F ) // 2219901 10964372 + RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x0000000F ) // 2985476 10576909 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 430488 6729680 + RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x000008CF, 0x000008CF ) // 317486 5192722 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 551185 3395443 + RASTERIZER( 0x0B, 0x00602409, 0x00045119, 0x00000000, 0x000B0779, 0x0000088F, 0x0000080F ) // 276296 3024329 // nbashowt - RASTERIZER( 0x05, 0x00002C35, 0x00045119, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 12589303 89992094 - RASTERIZER( 0x05, 0x00002435, 0x00045119, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 528689 41431369 - RASTERIZER( 0x05, 0x00002C35, 0x00045119, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 4346462 21676464 - RASTERIZER( 0x05, 0x00002C35, 0x00044110, 0x00000000, 0x000A0321, 0x00000A0F, 0xFFFFFFFF ) // 1311258 15990693 - RASTERIZER( 0x05, 0x00582435, 0x00045110, 0x00000000, 0x000B0739, 0x00000AC9, 0xFFFFFFFF ) // 498752 8603534 + RASTERIZER( 0x05, 0x00002C35, 0x00045119, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 12589303 89992094 + RASTERIZER( 0x05, 0x00002435, 0x00045119, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 528689 41431369 + RASTERIZER( 0x05, 0x00002C35, 0x00045119, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 4346462 21676464 + RASTERIZER( 0x05, 0x00002C35, 0x00044110, 0x00000000, 0x000A0321, 0x00000A0F, 0xFFFFFFFF ) // 1311258 15990693 + RASTERIZER( 0x05, 0x00582435, 0x00045110, 0x00000000, 0x000B0739, 0x00000AC9, 0xFFFFFFFF ) // 498752 8603534 // RASTERIZER( 0x05, 0x00000035, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 262625 8248367 - RASTERIZER( 0x05, 0x00582C35, 0x00045110, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 146310 7881711 - RASTERIZER( 0x05, 0x01424039, 0x00045110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 353983 6698613 - RASTERIZER( 0x05, 0x01422439, 0x00044119, 0x00000000, 0x000A0321, 0x00000A0F, 0xFFFFFFFF ) // 105456 5867982 + RASTERIZER( 0x05, 0x00582C35, 0x00045110, 0x00000000, 0x000B0739, 0x00000ACF, 0xFFFFFFFF ) // 146310 7881711 + RASTERIZER( 0x05, 0x01424039, 0x00045110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 353983 6698613 + RASTERIZER( 0x05, 0x01422439, 0x00044119, 0x00000000, 0x000A0321, 0x00000A0F, 0xFFFFFFFF ) // 105456 5867982 // sf2049 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 4535144 87108835 - RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x000B0379, 0x000008CF, 0xFFFFFFFF ) // 3460768 36622999 - RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x000B0379, 0x000000CF, 0xFFFFFFFF ) // 1167220 12527933 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 294802 12127575 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0000088F, 0xFFFFFFFF ) // 192929 11588013 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 322059 10421128 - RASTERIZER( 0x03, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0A452A0F, 0x0E47200F ) // 1449341 8868943 - RASTERIZER( 0x05, 0x00482435, 0x00045117, 0x000000C1, 0x000B0339, 0x0000000F, 0xFFFFFFFF ) // 874920 7250149 - RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x000000C1, 0x000B0339, 0x0000000F, 0xFFFFFFFF ) // 874920 6973439 - RASTERIZER( 0x05, 0x00602401, 0x00045119, 0x000000C1, 0x00030279, 0x00000A0F, 0xFFFFFFFF ) // 453774 6485154 - RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x00000A0F, 0xFFFFFFFF ) // 220733 5697617 - RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x000B0379, 0x0000000F, 0xFFFFFFFF ) // 348786 4416017 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0000000F, 0xFFFFFFFF ) // 4535144 87108835 + RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x000B0379, 0x000008CF, 0xFFFFFFFF ) // 3460768 36622999 + RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x000B0379, 0x000000CF, 0xFFFFFFFF ) // 1167220 12527933 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x000008CF, 0xFFFFFFFF ) // 294802 12127575 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0000088F, 0xFFFFFFFF ) // 192929 11588013 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0000080F, 0xFFFFFFFF ) // 322059 10421128 + RASTERIZER( 0x03, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x0A452A0F, 0x0E47200F ) // 1449341 8868943 + RASTERIZER( 0x05, 0x00482435, 0x00045117, 0x000000C1, 0x000B0339, 0x0000000F, 0xFFFFFFFF ) // 874920 7250149 + RASTERIZER( 0x05, 0x00482435, 0x00045119, 0x000000C1, 0x000B0339, 0x0000000F, 0xFFFFFFFF ) // 874920 6973439 + RASTERIZER( 0x05, 0x00602401, 0x00045119, 0x000000C1, 0x00030279, 0x00000A0F, 0xFFFFFFFF ) // 453774 6485154 + RASTERIZER( 0x05, 0x00602409, 0x00045119, 0x000000C1, 0x000B0779, 0x00000A0F, 0xFFFFFFFF ) // 220733 5697617 + RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x000B0379, 0x0000000F, 0xFFFFFFFF ) // 348786 4416017 // cartfury - RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x000000C1, 0x00030F39, 0x00000A0F, 0xFFFFFFFF ) // 3719502 47429534 - RASTERIZER( 0x05, 0x00420039, 0x00000000, 0x000000C1, 0x00030F39, 0x0000000F, 0xFFFFFFFF ) // 4821876 25433268 - RASTERIZER( 0x05, 0x0142A409, 0x00000000, 0x000000C1, 0x00030F3B, 0x00000ACF, 0xFFFFFFFF ) // 1704143 16287730 - RASTERIZER( 0x05, 0x00580035, 0x00045119, 0x000000C1, 0x00030B39, 0x00000A0F, 0xFFFFFFFF ) // 576134 13181152 - RASTERIZER( 0x05, 0x0142A409, 0x00000000, 0x00000000, 0x00030B39, 0x00000A0F, 0xFFFFFFFF ) // 2447036 13056499 - RASTERIZER( 0x05, 0x00420039, 0x00000000, 0x00000000, 0x00030F39, 0x00000A0F, 0xFFFFFFFF ) // 1597651 11909086 - RASTERIZER( 0x05, 0x00422439, 0x00000000, 0x000000C1, 0x00030F3B, 0x00000A0F, 0xFFFFFFFF ) // 1100912 11879195 - RASTERIZER( 0x05, 0x00420039, 0x00000000, 0x00000000, 0x00030F3B, 0x00000A0F, 0xFFFFFFFF ) // 1714391 11199323 - RASTERIZER( 0x05, 0x00582435, 0x00045110, 0x00000000, 0x00030BF9, 0x000000C9, 0xFFFFFFFF ) // 975518 11030280 + RASTERIZER( 0x05, 0x00000035, 0x00045119, 0x000000C1, 0x00030F39, 0x00000A0F, 0xFFFFFFFF ) // 3719502 47429534 + RASTERIZER( 0x05, 0x00420039, 0x00000000, 0x000000C1, 0x00030F39, 0x0000000F, 0xFFFFFFFF ) // 4821876 25433268 + RASTERIZER( 0x05, 0x0142A409, 0x00000000, 0x000000C1, 0x00030F3B, 0x00000ACF, 0xFFFFFFFF ) // 1704143 16287730 + RASTERIZER( 0x05, 0x00580035, 0x00045119, 0x000000C1, 0x00030B39, 0x00000A0F, 0xFFFFFFFF ) // 576134 13181152 + RASTERIZER( 0x05, 0x0142A409, 0x00000000, 0x00000000, 0x00030B39, 0x00000A0F, 0xFFFFFFFF ) // 2447036 13056499 + RASTERIZER( 0x05, 0x00420039, 0x00000000, 0x00000000, 0x00030F39, 0x00000A0F, 0xFFFFFFFF ) // 1597651 11909086 + RASTERIZER( 0x05, 0x00422439, 0x00000000, 0x000000C1, 0x00030F3B, 0x00000A0F, 0xFFFFFFFF ) // 1100912 11879195 + RASTERIZER( 0x05, 0x00420039, 0x00000000, 0x00000000, 0x00030F3B, 0x00000A0F, 0xFFFFFFFF ) // 1714391 11199323 + RASTERIZER( 0x05, 0x00582435, 0x00045110, 0x00000000, 0x00030BF9, 0x000000C9, 0xFFFFFFFF ) // 975518 11030280 // gradius4 - RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030BFB, 0x00000AC7, 0xFFFFFFFF ) // 1261361 78858051 - RASTERIZER( 0x05, 0x0000303A, 0x00004119, 0x00000000, 0x00030BFB, 0x000000C7, 0xFFFFFFFF ) // 398143 72518712 - RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x00000A87, 0xFFFFFFFF ) // 1716273 15992169 - RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 812651 15723260 - RASTERIZER( 0x05, 0x00582435, 0x00005119, 0x00000000, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 595637 13777035 - RASTERIZER( 0x05, 0x00000015, 0x00005119, 0x00000000, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 675880 12288373 - RASTERIZER( 0x00, 0x02422E12, 0x00005119, 0x00000000, 0x00030F7B, 0xFFFFFFFF, 0xFFFFFFFF ) // 404825 10544497 - RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030FFB, 0x00000AC7, 0xFFFFFFFF ) // 444690 6872107 - RASTERIZER( 0x00, 0x02420002, 0x00000009, 0x00000000, 0x00030F7B, 0xFFFFFFFF, 0xFFFFFFFF ) // 5455064 5726069 - RASTERIZER( 0x05, 0x00580021, 0x00005119, 0x00000000, 0x00030FFB, 0x00000AC7, 0xFFFFFFFF ) // 242000 5057019 + RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030BFB, 0x00000AC7, 0xFFFFFFFF ) // 1261361 78858051 + RASTERIZER( 0x05, 0x0000303A, 0x00004119, 0x00000000, 0x00030BFB, 0x000000C7, 0xFFFFFFFF ) // 398143 72518712 + RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x00000A87, 0xFFFFFFFF ) // 1716273 15992169 + RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 812651 15723260 + RASTERIZER( 0x05, 0x00582435, 0x00005119, 0x00000000, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 595637 13777035 + RASTERIZER( 0x05, 0x00000015, 0x00005119, 0x00000000, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 675880 12288373 + RASTERIZER( 0x00, 0x02422E12, 0x00005119, 0x00000000, 0x00030F7B, 0xFFFFFFFF, 0xFFFFFFFF ) // 404825 10544497 + RASTERIZER( 0x05, 0x00000005, 0x00005119, 0x00000000, 0x00030FFB, 0x00000AC7, 0xFFFFFFFF ) // 444690 6872107 + RASTERIZER( 0x00, 0x02420002, 0x00000009, 0x00000000, 0x00030F7B, 0xFFFFFFFF, 0xFFFFFFFF ) // 5455064 5726069 + RASTERIZER( 0x05, 0x00580021, 0x00005119, 0x00000000, 0x00030FFB, 0x00000AC7, 0xFFFFFFFF ) // 242000 5057019 // nbapbp - RASTERIZER( 0x05, 0x00426E19, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 2926955 28637513 - RASTERIZER( 0x05, 0x00424219, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 607076 17008880 - RASTERIZER( 0x05, 0x00422809, 0x00004610, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 562460 12415476 - RASTERIZER( 0x05, 0x02004219, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC1, 0xFFFFFFFF ) // 79809 7045963 - RASTERIZER( 0x05, 0x02004219, 0x00000000, 0x00000001, 0x00030B7B, 0x00000AC7, 0xFFFFFFFF ) // 94254 6047743 - RASTERIZER( 0x05, 0x00006E19, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 352375 4465810 - RASTERIZER( 0x05, 0x00422A19, 0x00004610, 0x00000001, 0x00030BFB, 0x00000AC7, 0xFFFFFFFF ) // 58835 3500582 - RASTERIZER( 0x05, 0x00004219, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 176291 2268659 - RASTERIZER( 0x05, 0x00424219, 0x00000000, 0x00000001, 0x00030B7B, 0x00000AC7, 0xFFFFFFFF ) // 13304 2250402 + RASTERIZER( 0x05, 0x00426E19, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 2926955 28637513 + RASTERIZER( 0x05, 0x00424219, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 607076 17008880 + RASTERIZER( 0x05, 0x00422809, 0x00004610, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 562460 12415476 + RASTERIZER( 0x05, 0x02004219, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC1, 0xFFFFFFFF ) // 79809 7045963 + RASTERIZER( 0x05, 0x02004219, 0x00000000, 0x00000001, 0x00030B7B, 0x00000AC7, 0xFFFFFFFF ) // 94254 6047743 + RASTERIZER( 0x05, 0x00006E19, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 352375 4465810 + RASTERIZER( 0x05, 0x00422A19, 0x00004610, 0x00000001, 0x00030BFB, 0x00000AC7, 0xFFFFFFFF ) // 58835 3500582 + RASTERIZER( 0x05, 0x00004219, 0x00000000, 0x00000001, 0x00030F7B, 0x00000AC7, 0xFFFFFFFF ) // 176291 2268659 + RASTERIZER( 0x05, 0x00424219, 0x00000000, 0x00000001, 0x00030B7B, 0x00000AC7, 0xFFFFFFFF ) // 13304 2250402 // virtpool - RASTERIZER( 0x05, 0x00002421, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 494481 13370166 - RASTERIZER( 0x05, 0x00002421, 0x00000000, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 45923 3905828 - RASTERIZER( 0x05, 0x00002425, 0x00445110, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 57946 3043998 - RASTERIZER( 0x05, 0x00482405, 0x00045110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 235221 962382 - RASTERIZER( 0x05, 0x00002421, 0x00000000, 0x00000000, 0x000B0739, 0x00000A09, 0xFFFFFFFF ) // 12297 930523 + RASTERIZER( 0x05, 0x00002421, 0x00000000, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 494481 13370166 + RASTERIZER( 0x05, 0x00002421, 0x00000000, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 45923 3905828 + RASTERIZER( 0x05, 0x00002425, 0x00445110, 0x00000000, 0x000B07F9, 0x00000A0F, 0xFFFFFFFF ) // 57946 3043998 + RASTERIZER( 0x05, 0x00482405, 0x00045110, 0x00000000, 0x000B0739, 0x00000A0F, 0xFFFFFFFF ) // 235221 962382 + RASTERIZER( 0x05, 0x00002421, 0x00000000, 0x00000000, 0x000B0739, 0x00000A09, 0xFFFFFFFF ) // 12297 930523 // gtfore01 - RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x00010F79, 0x00000ACD, 0xFFFFFFFF ) // 807566 29151846 - RASTERIZER( 0x0B, 0x00002425, 0x00045119, 0x000000C1, 0x00010F79, 0x0C224A0D, 0x00000A0D ) // 2116043 18259224 - RASTERIZER( 0x0B, 0x00002429, 0x00000000, 0x000000C1, 0x00010FF9, 0x00000A09, 0x00000A0F ) // 43784 3594532 - RASTERIZER( 0x0B, 0x00002425, 0x00045110, 0x000000C1, 0x00010FF9, 0x00000ACD, 0x00000ACD ) // 14899 1391390 + RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x00010F79, 0x00000ACD, 0xFFFFFFFF ) // 807566 29151846 + RASTERIZER( 0x0B, 0x00002425, 0x00045119, 0x000000C1, 0x00010F79, 0x0C224A0D, 0x00000A0D ) // 2116043 18259224 + RASTERIZER( 0x0B, 0x00002429, 0x00000000, 0x000000C1, 0x00010FF9, 0x00000A09, 0x00000A0F ) // 43784 3594532 + RASTERIZER( 0x0B, 0x00002425, 0x00045110, 0x000000C1, 0x00010FF9, 0x00000ACD, 0x00000ACD ) // 14899 1391390 // gtfore02 RASTERIZER( 0x0B, 0x00002425, 0x00045119, 0x000000C1, 0x00010F79, 0x0C224A0D, 0x00000ACD ) // 776841 12879143 // gtfore06 - RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x00010FF9, 0x00000ACD, 0xFFFFFFFF ) // 51144 2582597 + RASTERIZER( 0x05, 0x00482405, 0x00045119, 0x000000C1, 0x00010FF9, 0x00000ACD, 0xFFFFFFFF ) // 51144 2582597 { nullptr, rasterizer_params(0xffffffff) } }; diff --git a/src/devices/video/voodoo_render.h b/src/devices/video/voodoo_render.h index afdbcfc46e2..6bd6e4077c8 100644 --- a/src/devices/video/voodoo_render.h +++ b/src/devices/video/voodoo_render.h @@ -497,7 +497,7 @@ struct thread_stats_block class voodoo_renderer : public voodoo_poly_manager { - static constexpr u32 RASTER_HASH_SIZE = 97; // size of the rasterizer hash table + static constexpr u32 RASTER_HASH_SIZE = 97; // size of the rasterizer hash table public: using rasterizer_mfp = void (voodoo_renderer::*)(int32_t, const extent_t &, const poly_data &, int); diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index e2a2542c5c4..a5d743d6af7 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -173,17 +173,17 @@ WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z1_w) WRITE_LINE_MEMBER(efo_zsu_device::ctc1_z0_w) { -// printf("ctc1_z0_w %d\n", state); +// printf("ctc1_z0_w %d\n", state); } WRITE_LINE_MEMBER(efo_zsu_device::ctc1_z1_w) { -// printf("ctc1_z1_w %d\n", state); +// printf("ctc1_z1_w %d\n", state); } WRITE_LINE_MEMBER(efo_zsu_device::ctc1_z2_w) { -// printf("ctc1_z2_w %d\n", state); +// printf("ctc1_z2_w %d\n", state); } WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z2_w) diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 7b29c799e0c..88c4a804708 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -27,7 +27,7 @@ TODO: service mode enables "bright", it is actually same as NeoGeo device; - II & V board: Fix sound CPU crashes properly (nested NMIs); - Sky Soldiers: According to various references bosses should really time out after some time (reportedly ~80 secs.). - This is actually handled by the MCU, not unlike Gold Medalist; + This is actually handled by the MCU, not unlike Gold Medalist; - Sky Soldiers: BGM Fade out before boss battle isn't implemented; - Sky Adventure, probably others: on a real PCB reference BGM stutters when using 30 Hz autofire (not enough sound resources?); @@ -347,10 +347,10 @@ u16 alpha68k_II_state::alpha_II_trigger_r(offs_t offset) // Notice that there are additional shared RAM checks (i.e. 0x1e6a, 0x1e32, 0x1e3a), which causes the game to soft lock if not satisfied. // Apparently bosses should time out in ~80 seconds. m_microcontroller_data = 0x00; - + // Notice that a similar system is also used by Time Soldiers but most threads are actually NOP-ed out. // (basically anything that is >0x24) - // Most likely left-overs that eventually were completed with aforementioned Sky Soldiers. + // Most likely left-overs that eventually were completed with aforementioned Sky Soldiers. } m_shared_ram[0x29] = (source & 0xff00) | m_microcontroller_data; } diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp index e462569d25e..a9c8e3feef6 100644 --- a/src/mame/drivers/apple3.cpp +++ b/src/mame/drivers/apple3.cpp @@ -52,7 +52,7 @@ static void apple3_cards(device_slot_interface &device) device.option_add("cmsscsi", A2BUS_CMSSCSI); // CMS Apple II SCSI Card device.option_add("titan3plus2", A2BUS_TITAN3PLUS2); // Titan /// Plus 2 card device.option_add("mockingboard", A2BUS_MOCKINGBOARD); // Sweet Micro Systems Mockingboard (experimental on ///) - device.option_add("softcard3", A2BUS_SOFTCARD3); // Microsoft SoftCard /// + device.option_add("softcard3", A2BUS_SOFTCARD3); // Microsoft SoftCard /// } static void a3_floppies(device_slot_interface &device) diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp index 127e968ddc5..172035cfd57 100644 --- a/src/mame/drivers/bowltry.cpp +++ b/src/mame/drivers/bowltry.cpp @@ -10,18 +10,18 @@ - Decompress YGV631 GFXs (RGB555/RGB565 format?) - Add base YGV631 display parsing; - TT5665 sound interface doesn't quite work, also definitely missing bankswitching behaviour. - Notice that TT5665 works in 0x100000 data ROM banks, but only the first part seems to - have a valid table header? + Notice that TT5665 works in 0x100000 data ROM banks, but only the first part seems to + have a valid table header? - serial comms, very verbose; - I/O, we currently add aggressive hookups for debugging reasons; - - Understand how exactly the mechanical part comes into play. - The only thing available from the net is a cabinet picture, depicting a long bowling lane. - There's no video of this in action, the speculation is that there's a physical ball and pins - that are drawn OSD, and touchscreen sensors that determines hitting point. - - Are we missing an irq event here? - Whatever is happening with rand hookups it doesn't seem to have much impact on the game logic - (i.e. serial always sends a P1 0000, never a P2 or an actual positive score), or even acknowledge the - likely coin insertions, definitely needs some video display to verify. + - Understand how exactly the mechanical part comes into play. + The only thing available from the net is a cabinet picture, depicting a long bowling lane. + There's no video of this in action, the speculation is that there's a physical ball and pins + that are drawn OSD, and touchscreen sensors that determines hitting point. + - Are we missing an irq event here? + Whatever is happening with rand hookups it doesn't seem to have much impact on the game logic + (i.e. serial always sends a P1 0000, never a P2 or an actual positive score), or even acknowledge the + likely coin insertions, definitely needs some video display to verify. ATLUS PCB BT-208001 ------------------------ @@ -104,7 +104,7 @@ u16 bowltry_state::vregs_r(offs_t offset, u16 mem_mask) // ---- ---- ---- x---: unknown, may be DMA mode if (offset == 0x092/2) return (m_vregs[offset] & ~0x20) | (machine().rand() & 0x20); - + // other registers sets up stuff like cliprect coords (no CRTC?) // hard to say without decoded GFXs. @@ -123,7 +123,7 @@ u16 bowltry_state::fake_io_r(offs_t offset) void bowltry_state::bowltry_map(address_map &map) { -// map.unmap_value_high(); +// map.unmap_value_high(); map(0x000000, 0x07ffff).rom().region("maincpu", 0); map(0x080000, 0x083fff).ram(); // These two are clearly 8-bit inputs @@ -146,8 +146,8 @@ void bowltry_state::bowltry_map(address_map &map) void bowltry_state::bowltry_io(address_map &map) { // these looks either EEPROM or touchscreen style writes, with chip select etc. -// map(0x09, 0x09).r(FUNC(bowltry_state::fake_io_r)); -// map(0x0a, 0x0a).r(FUNC(bowltry_state::fake_io_r)); +// map(0x09, 0x09).r(FUNC(bowltry_state::fake_io_r)); +// map(0x0a, 0x0a).r(FUNC(bowltry_state::fake_io_r)); } static INPUT_PORTS_START( bowltry ) diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index 0a60a2ae2f2..63f42a2db3d 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -1139,9 +1139,9 @@ void cobra_state::video_start() uint32_t cobra_state::screen_update_cobra(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - if (m_has_psac) + if (m_has_psac) m_k001604->draw_back_layer(screen, bitmap, cliprect); - + m_renderer->display(&bitmap, cliprect); if (m_has_psac) diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp index 3b73d84106f..f6839e095a7 100644 --- a/src/mame/drivers/lwriter.cpp +++ b/src/mame/drivers/lwriter.cpp @@ -102,8 +102,8 @@ namespace { enum print_state { - READING_CMD, - WRITING_RESULT + READING_CMD, + WRITING_RESULT }; class lwriter_state : public driver_device diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp index c8092a43b7e..c396afd6ca7 100644 --- a/src/mame/drivers/namcos2.cpp +++ b/src/mame/drivers/namcos2.cpp @@ -21,9 +21,9 @@ Final Lap Notes: To change an option, move gear shift from low to high without touching the gas pedal TODO: - - Verify below still occur + - Verify below still occur - General + General - sprite/tilemap orthogonality needed Final Lap & Final Lap 2: @@ -49,9 +49,9 @@ TODO: Metal Hawk - ROZ wraparound isn't implemented (see large battleship in 2nd stage) - Burning Force (+ maybe others) - - POSIRQ is off-by-one, but adjusting it makes other cases worse - (because some layers are line-buffered and some aren't, and we need proper scroll/data latch times for each layer type?) + Burning Force (+ maybe others) + - POSIRQ is off-by-one, but adjusting it makes other cases worse + (because some layers are line-buffered and some aren't, and we need proper scroll/data latch times for each layer type?) The Namco System II board is a 5 ( only 4 are emulated ) CPU system. The complete system consists of two boards: CPU + GRAPHICS. It contains a large diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 5aafd22cce5..61833ed9bc1 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -1932,17 +1932,17 @@ void dfjail_state::sound_control_w(uint8_t data) void dfjail_state::dac_data_w(offs_t offset, uint8_t data) { /* - Z80 code in the NMI handler at 0x6e: - Sample in A - Copy A to E - Shift A left 2 and AND by 3C - write A to port 0x80 - Copy E to A - Shift right 4 times - write A to ports 0x81, 0x82, and 0x83 - - This means port 0x80 gets the bottom 4 bits of the 8-bit sample, offset by 2 bits, - and ports 81/82/83 get the top 4 bits of the sample, shifted right 4 bits. + Z80 code in the NMI handler at 0x6e: + Sample in A + Copy A to E + Shift A left 2 and AND by 3C + write A to port 0x80 + Copy E to A + Shift right 4 times + write A to ports 0x81, 0x82, and 0x83 + + This means port 0x80 gets the bottom 4 bits of the 8-bit sample, offset by 2 bits, + and ports 81/82/83 get the top 4 bits of the sample, shifted right 4 bits. */ if (offset == 0) { diff --git a/src/mame/drivers/vsmjtria.cpp b/src/mame/drivers/vsmjtria.cpp index ecb9659eed8..a17bf2495e3 100644 --- a/src/mame/drivers/vsmjtria.cpp +++ b/src/mame/drivers/vsmjtria.cpp @@ -164,7 +164,7 @@ void vsmjtria_state::nmi_ack_w(uint8_t data) template void vsmjtria_state::ctrl_w(uint8_t data) { -// flip_screen_set(data & 0x01); +// flip_screen_set(data & 0x01); m_bg_tilemap[Which]->set_flip((data & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); // (data & 0x02) is switched on and off in service mode @@ -495,7 +495,7 @@ void vsmjtria_state::machine_reset() if (m_sw2->read() & 1) { // Note: there's no direct setter in nvram_device that directly flushes contents for this case scenario - for (auto &nvram : m_nvram_data) + for (auto &nvram : m_nvram_data) std::fill_n(&nvram[0], nvram.length(), 0); logerror("machine_reset: flush NVRAM contents\n"); diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index e01485c452f..a7e91c67ea3 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -352,7 +352,7 @@ uint32_t midnrun_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma { m_k001005->draw(bitmap, cliprect); } - + m_k056832->tilemap_draw_dj(screen, bitmap, cliprect, 0, 0, 0); return 0; diff --git a/src/mame/video/k001005.cpp b/src/mame/video/k001005.cpp index e562ff3aecb..e23fccc9fd1 100644 --- a/src/mame/video/k001005.cpp +++ b/src/mame/video/k001005.cpp @@ -16,7 +16,7 @@ /* TODO: - Winding Heat (and maybe others) have slight Z-fighting problems. - - Player car shadow not visible in Winding Heat. Hidden by road, needs polygon priority or something similar? + - Player car shadow not visible in Winding Heat. Hidden by road, needs polygon priority or something similar? */ @@ -226,7 +226,7 @@ void k001005_renderer::draw_scanline_generic(int32_t scanline, const extent_t& e texel = rgbaint_t::bilinear_filter(tex00, tex01, tex10, tex11, ufrac * 16, vfrac * 16); texel_alpha = tex00 >> 24; - } + } } int idiff = std::clamp((int)(diff), 0, 255); @@ -250,7 +250,7 @@ void k001005_renderer::draw_scanline_generic(int32_t scanline, const extent_t& e rgbaint_t color(ia, ir, ig, ib); if (UseTexture && texel_alpha != 0) - { + { color.set(texel); } @@ -286,7 +286,7 @@ void k001005_renderer::draw_scanline_generic(int32_t scanline, const extent_t& e if (UseBilinear && texel_alpha < 0xff) { rgbaint_t fb_color(fb[x]); - texel_color.blend(fb_color, texel_alpha); + texel_color.blend(fb_color, texel_alpha); } if (UseFog) @@ -356,33 +356,33 @@ void k001005_renderer::draw_scanline_generic(int32_t scanline, const extent_t& e /* - Command - 0x00: xxxxxxxx xxxxxxxx xxxxxxx- -------- 0x80000000 (exact number of bits unknown) - 0x00: -------- -------- -------x -------- 0 = per-poly color, 1 = per-vertex color - 0x00: -------- -------- -------- x------- ? Texture related - 0x00: -------- -------- -------- -x------ Unused? - 0x00: -------- -------- -------- --x----- 1 = enable smooth shading? - 0x00: -------- -------- -------- ---x---- 1 = texture mirroring - 0x00: -------- -------- -------- ----x--- ? Texture related - 0x00: -------- -------- -------- -----x-- 1 = enable Z-buffer read - 0x00: -------- -------- -------- ------x- 0 = blend enabled, 1 = disabled - 0x00: -------- -------- -------- -------x 0 = per-vertex Z, 1 = per-poly Z (0x80000121 seems like an exception) - - Texture header - 0x01: -xxx---- -------- -------- -------- Texture palette - 0x01: ----xx-- -------- -------- -------- Unknown flags, set by commands 0x7b...0x7e. Used mostly on polygons further away from camera. Some kind of depth-based effect? - 0x01: ------xx x------- -------- -------- Texture width / 8 - 1 - 0x01: -------- -xxx---- -------- -------- Texture height / 8 - 1 - 0x01: -------- -------x xxxx---- -------- Texture page - 0x01: -------- -------- ----x-x- x-x-x-x- Texture X / 8 - 0x01: -------- -------- -----x-x -x-x-x-x Texture Y / 8 + Command + 0x00: xxxxxxxx xxxxxxxx xxxxxxx- -------- 0x80000000 (exact number of bits unknown) + 0x00: -------- -------- -------x -------- 0 = per-poly color, 1 = per-vertex color + 0x00: -------- -------- -------- x------- ? Texture related + 0x00: -------- -------- -------- -x------ Unused? + 0x00: -------- -------- -------- --x----- 1 = enable smooth shading? + 0x00: -------- -------- -------- ---x---- 1 = texture mirroring + 0x00: -------- -------- -------- ----x--- ? Texture related + 0x00: -------- -------- -------- -----x-- 1 = enable Z-buffer read + 0x00: -------- -------- -------- ------x- 0 = blend enabled, 1 = disabled + 0x00: -------- -------- -------- -------x 0 = per-vertex Z, 1 = per-poly Z (0x80000121 seems like an exception) + + Texture header + 0x01: -xxx---- -------- -------- -------- Texture palette + 0x01: ----xx-- -------- -------- -------- Unknown flags, set by commands 0x7b...0x7e. Used mostly on polygons further away from camera. Some kind of depth-based effect? + 0x01: ------xx x------- -------- -------- Texture width / 8 - 1 + 0x01: -------- -xxx---- -------- -------- Texture height / 8 - 1 + 0x01: -------- -------x xxxx---- -------- Texture page + 0x01: -------- -------- ----x-x- x-x-x-x- Texture X / 8 + 0x01: -------- -------- -----x-x -x-x-x-x Texture Y / 8 */ int k001005_renderer::parse_polygon(int index, uint32_t cmd) { render_delegate rd_scan_tex = render_delegate(&k001005_renderer::draw_scanline_generic, this); render_delegate rd_scan_vertex_color = render_delegate(&k001005_renderer::draw_scanline_generic, this); - render_delegate rd_scan_vertex_color_tex = render_delegate(&k001005_renderer::draw_scanline_generic, this); + render_delegate rd_scan_vertex_color_tex = render_delegate(&k001005_renderer::draw_scanline_generic, this); render_delegate rd_scan_color = render_delegate(&k001005_renderer::draw_scanline_generic, this); int viewport_min_x = std::clamp(256 + m_viewport_min_x + m_viewport_center_x, m_cliprect.min_x, m_cliprect.max_x); @@ -391,7 +391,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) int viewport_max_y = std::clamp(200 + m_viewport_max_y - m_viewport_center_y + 1, m_cliprect.min_y, m_cliprect.max_y); rectangle cliprect(viewport_min_x, viewport_max_x, viewport_min_y, viewport_max_y); - + int start_index = index; @@ -399,7 +399,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) bool has_texture = (cmd & 0x18) != 0; bool has_vertex_color = (cmd & 0x100) != 0; - bool has_vertex_z = !(cmd & 1) || has_vertex_color; // command 0x121 breaks the logic here, maybe vertex color enforces vertex z too? + bool has_vertex_z = !(cmd & 1) || has_vertex_color; // command 0x121 breaks the logic here, maybe vertex color enforces vertex z too? uint32_t texture_x = 0; uint32_t texture_y = 0; @@ -460,7 +460,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) // ------------------------------------------------------------------------- if (has_vertex_z) { - uint32_t z = fifo[index] & 0xffffff00; // 32-bit float with low 8-bits of mantissa masked out + uint32_t z = fifo[index] & 0xffffff00; // 32-bit float with low 8-bits of mantissa masked out int diffuse = fifo[index] & 0xff; index++; @@ -477,10 +477,10 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) // ------------------------------------------------------------------------- if (last_vertex && has_texture) { - // polygon Z comes before the last UV coords for textured polygons + // polygon Z comes before the last UV coords for textured polygons if (!has_vertex_z) { - uint32_t z = (fifo[index] & 0x07ffff00) | 0x48000000; // like fog values, these seem to be missing the 4 upper bits of exponent + uint32_t z = (fifo[index] & 0x07ffff00) | 0x48000000; // like fog values, these seem to be missing the 4 upper bits of exponent polygon_diffuse = fifo[index] & 0xff; index++; polygon_z = u2f(z); @@ -540,7 +540,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) // polygon Z if (!has_vertex_z) { - uint32_t z = (fifo[index] & 0x07ffff00) | 0x48000000; // like fog values, these seem to be missing the 4 upper bits of exponent + uint32_t z = (fifo[index] & 0x07ffff00) | 0x48000000; // like fog values, these seem to be missing the 4 upper bits of exponent polygon_diffuse = fifo[index] & 0xff; index++; @@ -574,7 +574,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) extra.texture_mirror = (cmd & 0x10); extra.diffuse_light = rgb_t(m_light_r, m_light_g, m_light_b); extra.ambient_light = rgb_t(m_ambient_r, m_ambient_g, m_ambient_b); - extra.fog_color = rgb_t(m_fog_r, m_fog_g, m_fog_b); + extra.fog_color = rgb_t(m_fog_r, m_fog_g, m_fog_b); extra.fog_enable = (m_reg_fog_start != 0xffff) && !(cmd & 1); extra.cmd = cmd; @@ -594,7 +594,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) int v2 = (m_vertexb_ptr - 2) & 3; int v3 = (m_vertexb_ptr - 1) & 3; - + // This fixes shading issues in the Konami logo in Solar Assault. // Some triangle strips have different shading values compared to reused vertices, causing unintended smooth shading. // This ensures all vertices have the same shading value. @@ -613,7 +613,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) if (is_quad) { if (has_vertex_color) - { + { render_triangle<10>(cliprect, has_texture ? rd_scan_vertex_color_tex : rd_scan_vertex_color, m_vertexb[v0], m_vertexb[v1], m_vertexb[v2]); render_triangle<10>(cliprect, has_texture ? rd_scan_vertex_color_tex : rd_scan_vertex_color, m_vertexb[v2], m_vertexb[v3], m_vertexb[v0]); } @@ -629,7 +629,7 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd) } } else - { + { if (has_vertex_color) { render_triangle<10>(cliprect, has_texture ? rd_scan_vertex_color_tex : rd_scan_vertex_color, m_vertexb[v1], m_vertexb[v2], m_vertexb[v3]); @@ -817,7 +817,7 @@ uint32_t k001005_device::read(address_space &space, offs_t offset, uint32_t mem_ return m_ram[0][(m_ram_ptr++) & 0x3fffff]; } - default: + default: //osd_printf_debug("%s m_r: %08X, %08X\n", machine().describe_context(), offset, mem_mask); break; } @@ -875,19 +875,19 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u case 0x100: break; case 0x101: break; // framebuffer width? - case 0x102: break; // framebuffer height? + case 0x102: break; // framebuffer height? - case 0x103: m_renderer->m_viewport_min_x = data & 0xffff; break; + case 0x103: m_renderer->m_viewport_min_x = data & 0xffff; break; case 0x104: m_renderer->m_viewport_max_x = data & 0xffff; break; case 0x105: m_renderer->m_viewport_max_y = data & 0xffff; break; - case 0x106: m_renderer->m_viewport_min_y = data & 0xffff; break; + case 0x106: m_renderer->m_viewport_min_y = data & 0xffff; break; - case 0x107: m_renderer->m_viewport_center_x = data & 0xffff; break; - case 0x108: m_renderer->m_viewport_center_y = data & 0xffff; break; + case 0x107: m_renderer->m_viewport_center_x = data & 0xffff; break; + case 0x108: m_renderer->m_viewport_center_y = data & 0xffff; break; case 0x109: // far Z value { - // the SHARC code throws away the bottom 11 bits of mantissa and the top 5 bits (to fit in a 16-bit register?) + // the SHARC code throws away the bottom 11 bits of mantissa and the top 5 bits (to fit in a 16-bit register?) m_renderer->m_far_z = u2f((data & 0xffff) << 11); break; } @@ -904,7 +904,7 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u case 0x111: m_renderer->m_fog_g = data & 0xff; break; case 0x112: m_renderer->m_fog_b = data & 0xff; break; - case 0x117: // linear fog start Z + case 0x117: // linear fog start Z { // 4 bits exponent + 12 bits mantissa, similar to far Z value // value of 0xffff is used to effectively turn off fog @@ -915,14 +915,14 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u m_renderer->m_fog_start_z = u2f((0x90000 | (data & 0xffff)) << 11); break; } - case 0x118: // linear fog end Z + case 0x118: // linear fog end Z { // 4 bits exponent + 12 bits mantissa, similar to far Z value m_renderer->m_fog_end_z = u2f((0x90000 | (data & 0xffff)) << 11); break; } - case 0x119: // 1 / (end_fog - start_fog) ? + case 0x119: // 1 / (end_fog - start_fog) ? { // 5 bits exponent + 11 bits mantissa break; diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h index d65646812c8..9d8d84d3002 100644 --- a/src/mame/video/k001005.h +++ b/src/mame/video/k001005.h @@ -20,7 +20,7 @@ struct k001005_polydata int texture_page; int texture_palette; bool texture_mirror; - rgb_t poly_color; + rgb_t poly_color; rgb_t diffuse_light; rgb_t ambient_light; rgb_t fog_color; diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp index adad9db6c50..6f90a19087e 100644 --- a/src/mame/video/k001604.cpp +++ b/src/mame/video/k001604.cpp @@ -17,7 +17,7 @@ * Foreground tiles 2x or 4x 1Mbit SRAM in a 16-bit bus. - GTI Club: 37C 34C 32C 29C filled - NWK-TR: 34A 31A filled, no empty solder pads - - Cobra: 6F 6H + - Cobra: 6F 6H * Background tiles 2x or 4x 1Mbit SRAM in a 16-bit bus. - GTI Club: 37A 34A filled, 32A 29A empty - NWK-TR: 34C 31C 28C 25C empty -- cgit v1.2.3