Skip to content

Commit e4bf4bd

Browse files
cuavascuavas
authored
konami/k001005.cpp: Tidy.
1 parent 8913373 commit e4bf4bd

File tree

1 file changed

+54
-83
lines changed

1 file changed

+54
-83
lines changed

‎src/mame/konami/k001005.cpp

+54-83
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ k001005_renderer::k001005_renderer(device_t &parent, screen_device &screen, devi
3333

3434
m_zb = std::make_unique<bitmap_ind32>(width, height);
3535

36-
m_3dfifo = std::make_unique<uint32_t[]>(0x10000);
36+
m_3dfifo = std::make_unique<uint32_t []>(0x10000);
3737
m_3dfifo_ptr = 0;
3838
m_fb_page = 0;
3939
m_light_r = 0;
@@ -60,8 +60,8 @@ k001005_renderer::k001005_renderer(device_t &parent, screen_device &screen, devi
6060

6161
for (int k = 0; k < 8; k++)
6262
{
63-
m_tex_mirror_table[0][k] = std::make_unique<int[]>(128);
64-
m_tex_mirror_table[1][k] = std::make_unique<int[]>(128);
63+
m_tex_mirror_table[0][k] = std::make_unique<int []>(128);
64+
m_tex_mirror_table[1][k] = std::make_unique<int []>(128);
6565

6666
int const size = (k + 1) * 8;
6767

@@ -124,7 +124,7 @@ void k001005_renderer::swap_buffers()
124124

125125
m_fb[m_fb_page]->fill(0, m_cliprect);
126126

127-
float const zvalue = 10000000000.0f;
127+
float const zvalue = 10000000000.0F;
128128
m_zb->fill(*(int*)&zvalue, m_cliprect);
129129
}
130130

@@ -139,8 +139,8 @@ void k001005_renderer::draw_scanline_generic(int32_t scanline, const extent_t& e
139139
{
140140
k001006_device* k001006 = downcast<k001006_device*>(m_k001006);
141141

142-
uint32_t* const fb = &m_fb[m_fb_page]->pix(scanline);
143-
float* const zb = (float*)&m_zb->pix(scanline);
142+
uint32_t *const fb = &m_fb[m_fb_page]->pix(scanline);
143+
float *const zb = (float*)&m_zb->pix(scanline);
144144

145145
float z = extent.param[POLY_Z].start;
146146
float const dz = extent.param[POLY_Z].dpdx;
@@ -208,10 +208,10 @@ void k001005_renderer::draw_scanline_generic(int32_t scanline, const extent_t& e
208208
{
209209
if (UseTexture)
210210
{
211-
float const oow = 1.0f / w;
211+
float const oow = 1.0F / w;
212212

213-
int iu = (int)(u * oow);
214-
int iv = (int)(v * oow);
213+
int iu = int(u * oow);
214+
int iv = int(v * oow);
215215

216216
if (!UseBilinear)
217217
{
@@ -526,8 +526,8 @@ int k001005_renderer::parse_polygon(int index, uint32_t cmd)
526526
int32_t const tv = (int16_t)(fifo[index] & 0xffff);
527527
index++;
528528

529-
m_vertexb[m_vertexb_ptr].p[POLY_U] = (float)(tu) * m_vertexb[m_vertexb_ptr].p[POLY_W];
530-
m_vertexb[m_vertexb_ptr].p[POLY_V] = (float)(tv) * m_vertexb[m_vertexb_ptr].p[POLY_W];
529+
m_vertexb[m_vertexb_ptr].p[POLY_U] = float(tu) * m_vertexb[m_vertexb_ptr].p[POLY_W];
530+
m_vertexb[m_vertexb_ptr].p[POLY_V] = float(tv) * m_vertexb[m_vertexb_ptr].p[POLY_W];
531531
}
532532

533533
// fog
@@ -703,6 +703,7 @@ void k001005_renderer::draw(bitmap_rgb32 &bitmap, const rectangle &cliprect)
703703
}
704704

705705

706+
706707
DEFINE_DEVICE_TYPE(K001005, k001005_device, "k001005", "K001005 Polygon Renderer")
707708

708709
k001005_device::k001005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@@ -780,40 +781,33 @@ uint32_t k001005_device::read(address_space &space, offs_t offset, uint32_t mem_
780781
switch(offset)
781782
{
782783
case 0x000: // FIFO read, high 16 bits
783-
{
784784
//osd_printf_debug("FIFO_r0: %08X\n", m_fifo_read_ptr);
785-
uint16_t const value = m_fifo[m_fifo_read_ptr] >> 16;
786-
return value;
787-
}
785+
return m_fifo[m_fifo_read_ptr] >> 16;
788786

789787
case 0x001: // FIFO read, low 16 bits
790-
{
791-
//osd_printf_debug("FIFO_r1: %08X\n", m_fifo_read_ptr);
792-
uint16_t const value = m_fifo[m_fifo_read_ptr] & 0xffff;
793-
794-
if (!machine().side_effects_disabled())
795788
{
796-
if (m_status != 1 && m_status != 2)
789+
//osd_printf_debug("FIFO_r1: %08X\n", m_fifo_read_ptr);
790+
uint16_t const value = m_fifo[m_fifo_read_ptr] & 0xffff;
791+
792+
if (!machine().side_effects_disabled())
797793
{
798-
if (m_fifo_read_ptr < 0x3ff)
794+
if (m_status != 1 && m_status != 2)
799795
{
800-
dsp->set_flag_input(1, CLEAR_LINE);
796+
if (m_fifo_read_ptr < 0x3ff)
797+
dsp->set_flag_input(1, CLEAR_LINE);
798+
else
799+
dsp->set_flag_input(1, ASSERT_LINE);
801800
}
802801
else
803802
{
804803
dsp->set_flag_input(1, ASSERT_LINE);
805804
}
805+
806+
m_fifo_read_ptr++;
807+
m_fifo_read_ptr &= 0x7ff;
806808
}
807-
else
808-
{
809-
dsp->set_flag_input(1, ASSERT_LINE);
810-
}
811-
812-
m_fifo_read_ptr++;
813-
m_fifo_read_ptr &= 0x7ff;
809+
return value;
814810
}
815-
return value;
816-
}
817811

818812
case 0x11b: // status ?
819813
return 0x8002;
@@ -822,20 +816,17 @@ uint32_t k001005_device::read(address_space &space, offs_t offset, uint32_t mem_
822816
return 0x8000;
823817

824818
case 0x11f:
825-
{
826-
uint32_t ret = 0;
827-
if (m_ram_ptr >= 0x400000)
828-
{
829-
ret = m_ram[1][m_ram_ptr & 0x3fffff];
830-
}
831-
else
832819
{
833-
ret = m_ram[0][m_ram_ptr & 0x3fffff];
820+
uint32_t ret = 0;
821+
if (m_ram_ptr >= 0x400000)
822+
ret = m_ram[1][m_ram_ptr & 0x3fffff];
823+
else
824+
ret = m_ram[0][m_ram_ptr & 0x3fffff];
825+
if (!machine().side_effects_disabled())
826+
m_ram_ptr++;
827+
return ret;
834828
}
835-
if (!machine().side_effects_disabled())
836-
m_ram_ptr++;
837-
return ret;
838-
}
829+
839830
default:
840831
//osd_printf_debug("%s m_r: %08X, %08X\n", machine().describe_context(), offset, mem_mask);
841832
break;
@@ -850,25 +841,20 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u
850841
switch (offset)
851842
{
852843
case 0x000: // FIFO write
853-
{
854844
//osd_printf_debug("%s K001005 FIFO write: %08X\n", machine().describe_context(), data);
855845
if (m_status != 1 && m_status != 2)
856846
{
857847
if (m_fifo_write_ptr < 0x400)
858-
{
859848
dsp->set_flag_input(1, ASSERT_LINE);
860-
}
861849
else
862-
{
863850
dsp->set_flag_input(1, CLEAR_LINE);
864-
}
865851
}
866852
else
867853
{
868854
dsp->set_flag_input(1, ASSERT_LINE);
869855
}
870856

871-
// osd_printf_debug("%s K001005 FIFO write: %08X\n", machine().describe_context(), data);
857+
//osd_printf_debug("%s K001005 FIFO write: %08X\n", machine().describe_context(), data);
872858
m_fifo[m_fifo_write_ptr] = data;
873859
m_fifo_write_ptr++;
874860
m_fifo_write_ptr &= 0x7ff;
@@ -887,9 +873,7 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u
887873
// This is used to make the SHARC timeout
888874
dsp->spin_until_trigger(10000);
889875
}
890-
891876
break;
892-
}
893877

894878
case 0x100: break;
895879

@@ -905,11 +889,9 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u
905889
case 0x108: m_renderer->m_viewport_center_y = data & 0xffff; break;
906890

907891
case 0x109: // far Z value
908-
{
909-
// the SHARC code throws away the bottom 11 bits of mantissa and the top 5 bits (to fit in a 16-bit register?)
910-
m_renderer->m_far_z = u2f((data & 0xffff) << 11);
911-
break;
912-
}
892+
// the SHARC code throws away the bottom 11 bits of mantissa and the top 5 bits (to fit in a 16-bit register?)
893+
m_renderer->m_far_z = u2f((data & 0xffff) << 11);
894+
break;
913895

914896
case 0x10a: m_renderer->m_light_r = data & 0xff; break;
915897
case 0x10b: m_renderer->m_light_g = data & 0xff; break;
@@ -924,28 +906,23 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u
924906
case 0x112: m_renderer->m_fog_b = data & 0xff; break;
925907

926908
case 0x117: // linear fog start Z
927-
{
928-
// 4 bits exponent + 12 bits mantissa, similar to far Z value
929-
// value of 0xffff is used to effectively turn off fog
930-
931-
// reconstruct float from 16-bit data
932-
// assuming implicit exponent 1001xxxx, sign bit 0 (z-values are all positive)
933-
m_renderer->m_reg_fog_start = data & 0xffff;
934-
m_renderer->m_fog_start_z = u2f((0x90000 | (data & 0xffff)) << 11);
935-
break;
936-
}
909+
// 4 bits exponent + 12 bits mantissa, similar to far Z value
910+
// value of 0xffff is used to effectively turn off fog
911+
912+
// reconstruct float from 16-bit data
913+
// assuming implicit exponent 1001xxxx, sign bit 0 (z-values are all positive)
914+
m_renderer->m_reg_fog_start = data & 0xffff;
915+
m_renderer->m_fog_start_z = u2f((0x90000 | (data & 0xffff)) << 11);
916+
break;
917+
937918
case 0x118: // linear fog end Z
938-
{
939-
// 4 bits exponent + 12 bits mantissa, similar to far Z value
940-
m_renderer->m_fog_end_z = u2f((0x90000 | (data & 0xffff)) << 11);
941-
break;
942-
}
919+
// 4 bits exponent + 12 bits mantissa, similar to far Z value
920+
m_renderer->m_fog_end_z = u2f((0x90000 | (data & 0xffff)) << 11);
921+
break;
943922

944923
case 0x119: // 1 / (end_fog - start_fog) ?
945-
{
946-
// 5 bits exponent + 11 bits mantissa
947-
break;
948-
}
924+
// 5 bits exponent + 11 bits mantissa
925+
break;
949926

950927

951928
case 0x11a:
@@ -956,9 +933,7 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u
956933
if (data == 2)
957934
{
958935
if (m_renderer->fifo_filled())
959-
{
960936
m_renderer->render_polygons();
961-
}
962937

963938
m_renderer->swap_buffers();
964939
}
@@ -975,13 +950,9 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u
975950

976951
case 0x11f:
977952
if (m_ram_ptr >= 0x400000)
978-
{
979953
m_ram[1][(m_ram_ptr++) & 0x3fffff] = data & 0xffff;
980-
}
981954
else
982-
{
983955
m_ram[0][(m_ram_ptr++) & 0x3fffff] = data & 0xffff;
984-
}
985956
break;
986957

987958
default:
@@ -991,7 +962,7 @@ void k001005_device::write(address_space &space, offs_t offset, uint32_t data, u
991962

992963
}
993964

994-
void k001005_device::draw( bitmap_rgb32 &bitmap, const rectangle &cliprect )
965+
void k001005_device::draw(bitmap_rgb32 &bitmap, const rectangle &cliprect)
995966
{
996967
m_renderer->draw(bitmap, cliprect);
997968
}

0 commit comments

Comments
 (0)