diff options
author | 2011-03-29 15:50:04 +0000 | |
---|---|---|
committer | 2011-03-29 15:50:04 +0000 | |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/emu/drawgfx.h | |
parent | b72cf3c5702b749c7bf26383ff05a9ab55022d31 (diff) |
BIG update.
Remove redundant machine items from address_space and device_t.
Neither machine nor m_machine are directly accessible anymore.
Instead a new getter machine() is available which returns a
machine reference. So:
space->machine->xxx ==> space->machine().xxx
device->machine->yyy ==> device->machine().yyy
Globally changed all running_machine pointers to running_machine
references. Any function/method that takes a running_machine takes
it as a required parameter (1 or 2 exceptions). Being consistent
here gets rid of a lot of odd &machine or *machine, but it does
mean a very large bulk change across the project.
Structs which have a running_machine * now have that variable
renamed to m_machine, and now have a shiny new machine() method
that works like the space and device methods above. Since most of
these are things that should eventually be devices anyway, consider
this a step in that direction.
98% of the update was done with regex searches. The changes are
architected such that the compiler will catch the remaining
errors:
// find things that use an embedded machine directly and replace
// with a machine() getter call
S: ->machine->
R: ->machine\(\)\.
// do the same if via a reference
S: \.machine->
R: \.machine\(\)\.
// convert function parameters to running_machine &
S: running_machine \*machine([^;])
R: running_machine \&machine\1
// replace machine-> with machine.
S: machine->
R: machine\.
// replace &machine() with machine()
S: \&([()->a-z0-9_]+machine\(\))
R: \1
// sanity check: look for this used as a cast
(running_machine &)
// and change to this:
*(running_machine *)
Diffstat (limited to 'src/emu/drawgfx.h')
-rw-r--r-- | src/emu/drawgfx.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h index b5f15be9ecb..4a379f580ab 100644 --- a/src/emu/drawgfx.h +++ b/src/emu/drawgfx.h @@ -120,6 +120,8 @@ struct _gfx_layout class gfx_element { public: + running_machine &machine() const { assert(m_machine != NULL); return *m_machine; } + UINT16 width; /* current pixel width of each element (changeble with source clipping) */ UINT16 height; /* current pixel height of each element (changeble with source clipping) */ UINT16 startx; /* current source clip X offset */ @@ -144,7 +146,7 @@ public: UINT8 * dirty; /* dirty array for detecting tiles that need decoding */ UINT32 dirtyseq; /* sequence number; incremented each time a tile is dirtied */ - running_machine *machine; /* pointer to the owning machine */ + running_machine *m_machine; /* pointer to the owning machine */ gfx_layout layout; /* copy of the original layout */ }; @@ -170,10 +172,10 @@ struct gfx_decode_entry /* ----- graphics elements ----- */ /* allocate memory for the graphics elements referenced by a machine */ -void gfx_init(running_machine *machine); +void gfx_init(running_machine &machine); /* allocate a gfx_element structure based on a given layout */ -gfx_element *gfx_element_alloc(running_machine *machine, const gfx_layout *gl, const UINT8 *srcdata, UINT32 total_colors, UINT32 color_base); +gfx_element *gfx_element_alloc(running_machine &machine, const gfx_layout *gl, const UINT8 *srcdata, UINT32 total_colors, UINT32 color_base); /* update a single code in a gfx_element */ void gfx_element_decode(const gfx_element *gfx, UINT32 code); @@ -182,7 +184,7 @@ void gfx_element_decode(const gfx_element *gfx, UINT32 code); void gfx_element_free(gfx_element *gfx); /* create a temporary one-off gfx_element */ -void gfx_element_build_temporary(gfx_element *gfx, running_machine *machine, UINT8 *base, UINT32 width, UINT32 height, UINT32 rowbytes, UINT32 color_base, UINT32 color_granularity, UINT32 flags); +void gfx_element_build_temporary(gfx_element *gfx, running_machine &machine, UINT8 *base, UINT32 width, UINT32 height, UINT32 rowbytes, UINT32 color_base, UINT32 color_granularity, UINT32 flags); |