From b018751a9a16b499ca17f5c65b6c22ffae234eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Wed, 19 Mar 2014 13:31:50 +0000 Subject: [PATCH] renamed old poly_manager to legacy_poly_manager --- src/emu/video/poly.c | 34 +++++++++++++++++----------------- src/emu/video/poly.h | 22 +++++++++++----------- src/emu/video/vooddefs.h | 2 +- src/mame/drivers/atarisy4.c | 2 +- src/mame/drivers/namcos23.c | 2 +- src/mame/includes/galastrm.h | 2 +- src/mame/includes/model2.h | 2 +- src/mame/includes/model3.h | 2 +- src/mame/video/gaelco3d.c | 1 - src/mame/video/gticlub.c | 2 +- src/mame/video/k001005.h | 2 +- src/mame/video/midzeus.c | 2 +- src/mame/video/midzeus2.c | 2 +- src/mame/video/model2.c | 2 +- 14 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/emu/video/poly.c b/src/emu/video/poly.c index 9f3936947f4..07f825612aa 100644 --- a/src/emu/video/poly.c +++ b/src/emu/video/poly.c @@ -123,7 +123,7 @@ union work_unit /* polygon_info describes a single polygon, which includes the poly_params */ struct polygon_info { - poly_manager * poly; /* pointer back to the poly manager */ + legacy_poly_manager * poly; /* pointer back to the poly manager */ void * dest; /* pointer to the destination we are rendering to */ void * extra; /* extra data pointer */ UINT8 numparams; /* number of parameters for this polygon */ @@ -136,7 +136,7 @@ struct polygon_info /* full poly manager description */ -struct poly_manager +struct legacy_poly_manager { /* queue management */ osd_work_queue * queue; /* work queue */ @@ -194,7 +194,7 @@ struct poly_manager static void **allocate_array(running_machine &machine, size_t *itemsize, UINT32 itemcount); static void *poly_item_callback(void *param, int threadid); -static void poly_state_presave(poly_manager *poly); +static void poly_state_presave(legacy_poly_manager *poly); @@ -274,7 +274,7 @@ INLINE void copy_vertex(poly_vertex *outv, const poly_vertex *v, int paramcount) object, blocking if we run out -------------------------------------------------*/ -INLINE polygon_info *allocate_polygon(poly_manager *poly, int miny, int maxy) +INLINE polygon_info *allocate_polygon(legacy_poly_manager *poly, int miny, int maxy) { /* wait for a work item if we have to */ if (poly->polygon_next + 1 > poly->polygon_count) @@ -308,12 +308,12 @@ INLINE polygon_info *allocate_polygon(poly_manager *poly, int miny, int maxy) manager -------------------------------------------------*/ -poly_manager *poly_alloc(running_machine &machine, int max_polys, size_t extra_data_size, UINT8 flags) +legacy_poly_manager *poly_alloc(running_machine &machine, int max_polys, size_t extra_data_size, UINT8 flags) { - poly_manager *poly; + legacy_poly_manager *poly; /* allocate the manager itself */ - poly = auto_alloc_clear(machine, poly_manager); + poly = auto_alloc_clear(machine, legacy_poly_manager); poly->flags = flags; /* allocate polygons */ @@ -348,7 +348,7 @@ poly_manager *poly_alloc(running_machine &machine, int max_polys, size_t extra_d poly_free - free a polygon manager -------------------------------------------------*/ -void poly_free(poly_manager *poly) +void poly_free(legacy_poly_manager *poly) { #if KEEP_STATISTICS { @@ -387,7 +387,7 @@ void poly_free(poly_manager *poly) to complete -------------------------------------------------*/ -void poly_wait(poly_manager *poly, const char *debug_reason) +void poly_wait(legacy_poly_manager *poly, const char *debug_reason) { osd_ticks_t time; @@ -431,7 +431,7 @@ void poly_wait(poly_manager *poly, const char *debug_reason) extra data for the next polygon -------------------------------------------------*/ -void *poly_get_extra_data(poly_manager *poly) +void *poly_get_extra_data(legacy_poly_manager *poly) { /* wait for a work item if we have to */ if (poly->extra_next + 1 > poly->extra_count) @@ -460,7 +460,7 @@ void *poly_get_extra_data(poly_manager *poly) triangle given 3 vertexes -------------------------------------------------*/ -UINT32 poly_render_triangle(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3) +UINT32 poly_render_triangle(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3) { float dxdy_v1v2, dxdy_v1v3, dxdy_v2v3; const poly_vertex *tv; @@ -643,7 +643,7 @@ UINT32 poly_render_triangle(poly_manager *poly, void *dest, const rectangle &cli triangles in a fan -------------------------------------------------*/ -UINT32 poly_render_triangle_fan(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v) +UINT32 poly_render_triangle_fan(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v) { UINT32 pixels = 0; int vertnum; @@ -660,7 +660,7 @@ UINT32 poly_render_triangle_fan(poly_manager *poly, void *dest, const rectangle render of an object, given specific extents -------------------------------------------------*/ -UINT32 poly_render_triangle_custom(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int startscanline, int numscanlines, const poly_extent *extents) +UINT32 poly_render_triangle_custom(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int startscanline, int numscanlines, const poly_extent *extents) { INT32 curscan, scaninc; polygon_info *polygon; @@ -756,7 +756,7 @@ UINT32 poly_render_triangle_custom(poly_manager *poly, void *dest, const rectang given 4 vertexes -------------------------------------------------*/ -UINT32 poly_render_quad(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3, const poly_vertex *v4) +UINT32 poly_render_quad(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3, const poly_vertex *v4) { poly_edge fedgelist[3], bedgelist[3]; const poly_edge *ledge, *redge; @@ -976,7 +976,7 @@ UINT32 poly_render_quad(poly_manager *poly, void *dest, const rectangle &cliprec quads in a fan -------------------------------------------------*/ -UINT32 poly_render_quad_fan(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v) +UINT32 poly_render_quad_fan(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v) { UINT32 pixels = 0; int vertnum; @@ -998,7 +998,7 @@ UINT32 poly_render_quad_fan(poly_manager *poly, void *dest, const rectangle &cli to 32 vertices -------------------------------------------------*/ -UINT32 poly_render_polygon(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v) +UINT32 poly_render_polygon(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v) { poly_edge fedgelist[MAX_POLYGON_VERTS - 1], bedgelist[MAX_POLYGON_VERTS - 1]; const poly_edge *ledge, *redge; @@ -1351,7 +1351,7 @@ static void *poly_item_callback(void *param, int threadid) ensure everything is synced before saving -------------------------------------------------*/ -static void poly_state_presave(poly_manager *poly) +static void poly_state_presave(legacy_poly_manager *poly) { poly_wait(poly, "pre-save"); } diff --git a/src/emu/video/poly.h b/src/emu/video/poly.h index bd314822133..65a24c1356d 100644 --- a/src/emu/video/poly.h +++ b/src/emu/video/poly.h @@ -55,7 +55,7 @@ ***************************************************************************/ /* opaque reference to the poly manager */ -struct poly_manager; +struct legacy_poly_manager; /* input vertex data */ @@ -97,50 +97,50 @@ typedef void (*poly_draw_scanline_func)(void *dest, INT32 scanline, const poly_e /* ----- initialization/teardown ----- */ /* allocate a new poly manager that can render triangles */ -poly_manager *poly_alloc(running_machine &machine, int max_polys, size_t extra_data_size, UINT8 flags); +legacy_poly_manager *poly_alloc(running_machine &machine, int max_polys, size_t extra_data_size, UINT8 flags); /* free a poly manager */ -void poly_free(poly_manager *poly); +void poly_free(legacy_poly_manager *poly); /* ----- common functions ----- */ /* wait until all polygons in the queue have been rendered */ -void poly_wait(poly_manager *poly, const char *debug_reason); +void poly_wait(legacy_poly_manager *poly, const char *debug_reason); /* get a pointer to the extra data for the next polygon */ -void *poly_get_extra_data(poly_manager *poly); +void *poly_get_extra_data(legacy_poly_manager *poly); /* ----- core triangle rendering ----- */ /* render a single triangle given 3 vertexes */ -UINT32 poly_render_triangle(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3); +UINT32 poly_render_triangle(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3); /* render a set of triangles in a fan */ -UINT32 poly_render_triangle_fan(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v); +UINT32 poly_render_triangle_fan(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v); /* perform a custom render of an object, given specific extents */ -UINT32 poly_render_triangle_custom(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int startscanline, int numscanlines, const poly_extent *extents); +UINT32 poly_render_triangle_custom(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int startscanline, int numscanlines, const poly_extent *extents); /* ----- core quad rendering ----- */ /* render a single quad given 4 vertexes */ -UINT32 poly_render_quad(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3, const poly_vertex *v4); +UINT32 poly_render_quad(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, const poly_vertex *v1, const poly_vertex *v2, const poly_vertex *v3, const poly_vertex *v4); /* render a set of quads in a fan */ -UINT32 poly_render_quad_fan(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v); +UINT32 poly_render_quad_fan(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v); /* ----- core polygon rendering ----- */ /* render a single polygon up to 32 vertices */ -UINT32 poly_render_polygon(poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v); +UINT32 poly_render_polygon(legacy_poly_manager *poly, void *dest, const rectangle &cliprect, poly_draw_scanline_func callback, int paramcount, int numverts, const poly_vertex *v); diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h index 60c20b849a7..20490793092 100644 --- a/src/emu/video/vooddefs.h +++ b/src/emu/video/vooddefs.h @@ -1715,7 +1715,7 @@ struct voodoo_state tmu_shared_state tmushare; /* TMU shared state */ banshee_info banshee; /* Banshee state */ - poly_manager * poly; /* polygon manager */ + legacy_poly_manager * poly; /* polygon manager */ stats_block * thread_stats; /* per-thread statistics */ voodoo_stats stats; /* internal statistics */ diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c index e56f115806b..707ee5be3fc 100644 --- a/src/mame/drivers/atarisy4.c +++ b/src/mame/drivers/atarisy4.c @@ -40,7 +40,7 @@ public: required_shared_ptr m_m68k_ram; UINT16 *m_shared_ram[2]; required_shared_ptr m_screen_ram; - poly_manager *m_poly; + legacy_poly_manager *m_poly; DECLARE_WRITE16_MEMBER(gpu_w); DECLARE_READ16_MEMBER(gpu_r); DECLARE_READ16_MEMBER(m68k_shared_0_r); diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 074651812bd..e3a5e832359 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1331,7 +1331,7 @@ struct c404_t struct render_t { - poly_manager *polymgr; + legacy_poly_manager *polymgr; int cur; int poly_count; int count[2]; diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index fe6a4d9f8bf..e3190ccb860 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -55,7 +55,7 @@ public: struct tempsprite *m_sprite_ptr_pre; bitmap_ind16 m_tmpbitmaps; bitmap_ind16 m_polybitmap; - poly_manager *m_poly; + legacy_poly_manager *m_poly; int m_rsxb; int m_rsyb; int m_rsxoffs; diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 47a683498c3..1d0bc2707f6 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -95,7 +95,7 @@ public: int m_jnet_time_out; UINT32 m_geo_read_start_address; UINT32 m_geo_write_start_address; - poly_manager *m_poly; + legacy_poly_manager *m_poly; raster_state *m_raster; geo_state *m_geo; bitmap_rgb32 m_sys24_bitmap; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index f0dae53c5c1..3ab4862b8f9 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -101,7 +101,7 @@ public: VECTOR3 m_parallel_light; float m_parallel_light_intensity; float m_ambient_light_intensity; - poly_manager *m_poly; + legacy_poly_manager *m_poly; int m_list_depth; int m_tick; int m_debug_layer_disable; diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c index c0f62b8e5da..20a549fc450 100644 --- a/src/mame/video/gaelco3d.c +++ b/src/mame/video/gaelco3d.c @@ -12,7 +12,6 @@ #include "includes/gaelco3d.h" #include "cpu/tms32031/tms32031.h" #include "video/rgbutil.h" -#include "video/poly.h" #define MAX_POLYGONS 4096 diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index 51d949f47fc..97d55b1c90d 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -213,7 +213,7 @@ static int *tex_mirror_table[2][8]; static int K001005_bitmap_page = 0; -static poly_manager *poly; +static legacy_poly_manager *poly; static poly_vertex prev_v[4]; static UINT32 fog_r, fog_g, fog_b; diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h index 981d4890fea..070950c3444 100644 --- a/src/mame/video/k001005.h +++ b/src/mame/video/k001005.h @@ -77,7 +77,7 @@ private: int m_bitmap_page; - poly_manager *m_poly; + legacy_poly_manager *m_poly; poly_vertex m_prev_v[4]; int m_prev_poly_type; diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c index ce87b76aaab..ff954d2286e 100644 --- a/src/mame/video/midzeus.c +++ b/src/mame/video/midzeus.c @@ -57,7 +57,7 @@ struct poly_extra_data * *************************************/ -static poly_manager *poly; +static legacy_poly_manager *poly; static UINT8 log_fifo; static UINT32 zeus_fifo[20]; diff --git a/src/mame/video/midzeus2.c b/src/mame/video/midzeus2.c index 5ea2b4fc5b6..fb459453803 100644 --- a/src/mame/video/midzeus2.c +++ b/src/mame/video/midzeus2.c @@ -57,7 +57,7 @@ struct poly_extra_data * *************************************/ -static poly_manager *poly; +static legacy_poly_manager *poly; static UINT8 log_fifo; static UINT32 zeus_fifo[20]; diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c index 664c11943e5..1a1a833dec3 100644 --- a/src/mame/video/model2.c +++ b/src/mame/video/model2.c @@ -924,7 +924,7 @@ static const poly_draw_scanline_func render_funcs[8] = static void model2_3d_render( model2_state *state, bitmap_rgb32 &bitmap, triangle *tri, const rectangle &cliprect ) { - poly_manager *poly = state->m_poly; + legacy_poly_manager *poly = state->m_poly; poly_extra_data *extra = (poly_extra_data *)poly_get_extra_data(poly); UINT8 renderer;