From d2e07e48dc1e1b20fef82b66a7d7655b6411f83a Mon Sep 17 00:00:00 2001 From: angelosa Date: Thu, 1 Mar 2018 13:02:21 +0100 Subject: [PATCH] model2.cpp: bulk replace part #2 (nw) --- src/mame/includes/model2.h | 17 ++++++++++++++++- src/mame/video/model2.cpp | 14 +++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index d0ad24f0620..e65df1996d0 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -277,7 +277,6 @@ private: bool m_render_unk; bool m_render_mode; - inline void model2_3d_project( triangle *tri ); uint32_t *geo_process_command( geo_state *geo, uint32_t opcode, uint32_t *input, bool *end_code ); // geo commands uint32_t *geo_nop( geo_state *geo, uint32_t opcode, uint32_t *input ); @@ -301,6 +300,22 @@ private: uint32_t *geo_lod( geo_state *geo, uint32_t opcode, uint32_t *input ); uint32_t *geo_code_upload( geo_state *geo, uint32_t opcode, uint32_t *input ); uint32_t *geo_code_jump( geo_state *geo, uint32_t opcode, uint32_t *input ); + // geo code drawing paths + void geo_parse_np_ns( geo_state *geo, uint32_t *input, uint32_t count ); + void geo_parse_np_s( geo_state *geo, uint32_t *input, uint32_t count ); + void geo_parse_nn_ns( geo_state *geo, uint32_t *input, uint32_t count ); + void geo_parse_nn_s( geo_state *geo, uint32_t *input, uint32_t count ); + + // raster functions + // main data input port + void model2_3d_push( raster_state *raster, uint32_t input ); + // quad & triangle push paths + void model2_3d_process_quad( raster_state *raster, uint32_t attr ); + void model2_3d_process_triangle( raster_state *raster, uint32_t attr ); + + // inliners + inline void model2_3d_project( triangle *tri ); + }; /***************************** diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp index ca7a315d5ac..9a7d2208309 100644 --- a/src/mame/video/model2.cpp +++ b/src/mame/video/model2.cpp @@ -311,7 +311,7 @@ READ32_MEMBER(model2_state::polygon_count_r) * *******************************************/ -static void model2_3d_process_quad( raster_state *raster, uint32_t attr ) +void model2_state::model2_3d_process_quad( raster_state *raster, uint32_t attr ) { quad_m2 object; uint16_t *th, *tp; @@ -551,7 +551,7 @@ static void model2_3d_process_quad( raster_state *raster, uint32_t attr ) } } -static void model2_3d_process_triangle( raster_state *raster, uint32_t attr ) +void model2_state::model2_3d_process_triangle( raster_state *raster, uint32_t attr ) { triangle object; uint16_t *th, *tp; @@ -948,7 +948,7 @@ void model2_state::model2_3d_frame_end( bitmap_rgb32 &bitmap, const rectangle &c } /* 3D Rasterizer main data input port */ -static void model2_3d_push( raster_state *raster, uint32_t input ) +void model2_state::model2_3d_push( raster_state *raster, uint32_t input ) { /* see if we have a command in progress */ if ( raster->cur_command != 0 ) @@ -1185,7 +1185,7 @@ void model2_state::geo_init(memory_region *polygon_rom) *******************************************/ /* Parse Polygons: Normals Present, No Specular case */ -static void geo_parse_np_ns( geo_state *geo, uint32_t *input, uint32_t count ) +void model2_state::geo_parse_np_ns( geo_state *geo, uint32_t *input, uint32_t count ) { raster_state *raster = geo->raster; poly_vertex point, normal; @@ -1337,7 +1337,7 @@ static void geo_parse_np_ns( geo_state *geo, uint32_t *input, uint32_t count ) } /* Parse Polygons: Normals Present, Specular case */ -static void geo_parse_np_s( geo_state *geo, uint32_t *input, uint32_t count ) +void model2_state::geo_parse_np_s( geo_state *geo, uint32_t *input, uint32_t count ) { raster_state *raster = geo->raster; poly_vertex point, normal; @@ -1498,7 +1498,7 @@ static void geo_parse_np_s( geo_state *geo, uint32_t *input, uint32_t count ) } /* Parse Polygons: No Normals, No Specular case */ -static void geo_parse_nn_ns( geo_state *geo, uint32_t *input, uint32_t count ) +void model2_state::geo_parse_nn_ns( geo_state *geo, uint32_t *input, uint32_t count ) { raster_state *raster = geo->raster; poly_vertex point, normal, p0, p1, p2, p3; @@ -1693,7 +1693,7 @@ static void geo_parse_nn_ns( geo_state *geo, uint32_t *input, uint32_t count ) } /* Parse Polygons: No Normals, Specular case */ -static void geo_parse_nn_s( geo_state *geo, uint32_t *input, uint32_t count ) +void model2_state::geo_parse_nn_s( geo_state *geo, uint32_t *input, uint32_t count ) { raster_state *raster = geo->raster; poly_vertex point, normal, p0, p1, p2, p3;