diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-12 08:58:57 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-12 08:58:57 +0100 |
commit | 379581fb3690d92f7e3815534a479823aee8ddcc (patch) | |
tree | 77b4a080ba46ba58bfd8382926580cb2aad5a69d /src/mame/video | |
parent | afe2bbe6481acf518e384509586ada235e106c54 (diff) |
macro removal INLINE -> static inline (nw)
Diffstat (limited to 'src/mame/video')
-rw-r--r-- | src/mame/video/amiga.cpp | 12 | ||||
-rw-r--r-- | src/mame/video/amigaaga.cpp | 12 | ||||
-rw-r--r-- | src/mame/video/gba.cpp | 14 | ||||
-rw-r--r-- | src/mame/video/hng64.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/k053936.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/konamigx.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/mcd212.cpp | 6 | ||||
-rw-r--r-- | src/mame/video/midzeus.cpp | 32 | ||||
-rw-r--r-- | src/mame/video/midzeus2.cpp | 18 | ||||
-rw-r--r-- | src/mame/video/model2.cpp | 10 | ||||
-rw-r--r-- | src/mame/video/model3.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/namcofl.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/namconb1.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/namcos2.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/newport.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/rdpfiltr.inc | 34 | ||||
-rw-r--r-- | src/mame/video/tatsumi.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/victory.cpp | 2 | ||||
-rw-r--r-- | src/mame/video/vrender0.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/wgp.cpp | 2 |
20 files changed, 85 insertions, 85 deletions
diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp index 79651098c66..d049cc2e165 100644 --- a/src/mame/video/amiga.cpp +++ b/src/mame/video/amiga.cpp @@ -381,7 +381,7 @@ void amiga_sprite_enable_comparitor(running_machine &machine, int which, int ena * *************************************/ -INLINE void fetch_sprite_data(amiga_state *state, int scanline, int sprite) +static inline void fetch_sprite_data(amiga_state *state, int scanline, int sprite) { CUSTOM_REG(REG_SPR0DATA + 4 * sprite) = state->chip_ram_r(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 0); CUSTOM_REG(REG_SPR0DATB + 4 * sprite) = state->chip_ram_r(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2); @@ -457,7 +457,7 @@ static void update_sprite_dma(amiga_state *state, int scanline) * *************************************/ -INLINE UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits) +static inline UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits) { return (amiga_expand_byte[lobits & 0xff] << 0) | (amiga_expand_byte[lobits >> 8] << 16) | (amiga_expand_byte[hibits & 0xff] << 1) | (amiga_expand_byte[hibits >> 8] << 17); @@ -557,7 +557,7 @@ static int get_sprite_pixel(amiga_state *state, int x) * *************************************/ -INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs) +static inline UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs) { UINT8 pix = (CUSTOM_REG(REG_BPL1DAT) >> obitoffs) & 1; if (planes >= 3) @@ -570,7 +570,7 @@ INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs } -INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs) +static inline UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs) { UINT8 pix = 0; if (planes >= 2) @@ -586,7 +586,7 @@ INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoff return pix; } -INLINE void fetch_bitplane_data(amiga_state *state, int plane) +static inline void fetch_bitplane_data(amiga_state *state, int plane) { CUSTOM_REG(REG_BPL1DAT + plane) = state->chip_ram_r(CUSTOM_REG_LONG(REG_BPL1PTH + plane * 2)); CUSTOM_REG_LONG(REG_BPL1PTH + plane * 2) += 2; @@ -599,7 +599,7 @@ INLINE void fetch_bitplane_data(amiga_state *state, int plane) * *************************************/ -INLINE int update_ham(amiga_state *state, int newpix) +static inline int update_ham(amiga_state *state, int newpix) { switch (newpix >> 4) { diff --git a/src/mame/video/amigaaga.cpp b/src/mame/video/amigaaga.cpp index 6af424998e0..88dac2caf91 100644 --- a/src/mame/video/amigaaga.cpp +++ b/src/mame/video/amigaaga.cpp @@ -89,7 +89,7 @@ VIDEO_START_MEMBER(amiga_state,amiga_aga) * *************************************/ -INLINE void fetch_sprite_data(amiga_state *state, int scanline, int sprite) +static inline void fetch_sprite_data(amiga_state *state, int scanline, int sprite) { switch((CUSTOM_REG(REG_FMODE) >> 2) & 0x03) { @@ -217,7 +217,7 @@ static void update_sprite_dma(amiga_state *state, int scanline) * *************************************/ -INLINE UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits) +static inline UINT32 interleave_sprite_data(UINT16 lobits, UINT16 hibits) { return (amiga_expand_byte[lobits & 0xff] << 0) | (amiga_expand_byte[lobits >> 8] << 16) | (amiga_expand_byte[hibits & 0xff] << 1) | (amiga_expand_byte[hibits >> 8] << 17); @@ -332,7 +332,7 @@ static int get_sprite_pixel(amiga_state *state, int x) * *************************************/ -INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs) +static inline UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs) { UINT64 *aga_bpldat = state->m_aga_bpldat; UINT8 pix = (aga_bpldat[0] >> obitoffs) & 1; @@ -350,7 +350,7 @@ INLINE UINT8 assemble_odd_bitplanes(amiga_state *state, int planes, int obitoffs } -INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs) +static inline UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoffs) { UINT8 pix = 0; if (planes >= 2) @@ -371,7 +371,7 @@ INLINE UINT8 assemble_even_bitplanes(amiga_state *state, int planes, int ebitoff return pix; } -INLINE void fetch_bitplane_data(amiga_state *state, int plane) +static inline void fetch_bitplane_data(amiga_state *state, int plane) { UINT64 *aga_bpldat = state->m_aga_bpldat; @@ -409,7 +409,7 @@ INLINE void fetch_bitplane_data(amiga_state *state, int plane) * *************************************/ -INLINE rgb_t update_ham(amiga_state *state, int newpix) +static inline rgb_t update_ham(amiga_state *state, int newpix) { switch (newpix & 0x03) { diff --git a/src/mame/video/gba.cpp b/src/mame/video/gba.cpp index e0883eafee1..17b8d926938 100644 --- a/src/mame/video/gba.cpp +++ b/src/mame/video/gba.cpp @@ -15,7 +15,7 @@ #define VERBOSE_LEVEL (0) -INLINE void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...) +static inline void ATTR_PRINTF(3,4) verboselog(device_t &device, int n_level, const char *s_fmt, ...) { if( VERBOSE_LEVEL >= n_level ) { @@ -34,9 +34,9 @@ static const int coeff[32] = { }; /* Utility functions */ -INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb); -INLINE UINT32 increase_brightness(UINT32 color, int coeff_); -INLINE UINT32 decrease_brightness(UINT32 color, int coeff_); +static inline UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb); +static inline UINT32 increase_brightness(UINT32 color, int coeff_); +static inline UINT32 decrease_brightness(UINT32 color, int coeff_); #define GBA_MODE0 0 #define GBA_MODE1 1 @@ -1776,7 +1776,7 @@ inline int gba_state::is_in_window(int x, int window) return 0; } -INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb) +static inline UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb) { if(color0 < 0x80000000) { @@ -1799,7 +1799,7 @@ INLINE UINT32 alpha_blend_pixel(UINT32 color0, UINT32 color1, int ca, int cb) return color0; } -INLINE UINT32 increase_brightness(UINT32 color, int coeff_) +static inline UINT32 increase_brightness(UINT32 color, int coeff_) { int r = (color >> 0) & 0x1f; int g = (color >> 5) & 0x1f; @@ -1816,7 +1816,7 @@ INLINE UINT32 increase_brightness(UINT32 color, int coeff_) return (color & 0xffff0000) | (b << 10) | (g << 5) | r; } -INLINE UINT32 decrease_brightness(UINT32 color, int coeff_) +static inline UINT32 decrease_brightness(UINT32 color, int coeff_) { int r = (color >> 0) & 0x1f; int g = (color >> 5) & 0x1f; diff --git a/src/mame/video/hng64.cpp b/src/mame/video/hng64.cpp index ac7084687b6..015c8ae0fac 100644 --- a/src/mame/video/hng64.cpp +++ b/src/mame/video/hng64.cpp @@ -220,7 +220,7 @@ static void hng64_configure_blit_parameters(blit_parameters *blit, tilemap_t *tm } } -INLINE UINT32 alpha_additive_r32(UINT32 d, UINT32 s, UINT8 level) +static inline UINT32 alpha_additive_r32(UINT32 d, UINT32 s, UINT8 level) { UINT32 add; add = (s & 0x00ff0000) + (d & 0x00ff0000); diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp index b7ce3aa158f..f29039970dc 100644 --- a/src/mame/video/k053936.cpp +++ b/src/mame/video/k053936.cpp @@ -433,7 +433,7 @@ void K053936GP_set_cliprect(int chip, int minx, int maxx, int miny, int maxy) cliprect.set(minx, maxx, miny, maxy); } -INLINE void K053936GP_copyroz32clip( running_machine &machine, +static inline void K053936GP_copyroz32clip( running_machine &machine, bitmap_rgb32 &dst_bitmap, bitmap_ind16 &src_bitmap, const rectangle &dst_cliprect, const rectangle &src_cliprect, UINT32 _startx,UINT32 _starty,int _incxx,int _incxy,int _incyx,int _incyy, diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp index a1720ccca1a..ab0b87a06fa 100644 --- a/src/mame/video/konamigx.cpp +++ b/src/mame/video/konamigx.cpp @@ -14,7 +14,7 @@ #define VERBOSE 0 -INLINE void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data); +static inline void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data); void konamigx_state::konamigx_precache_registers(void) @@ -1559,7 +1559,7 @@ UINT32 konamigx_state::screen_update_konamigx_right(screen_device &screen, bitma return 0; } -INLINE void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data) +static inline void set_color_555(palette_device &palette, pen_t color, int rshift, int gshift, int bshift, UINT16 data) { palette.set_pen_color(color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift)); } diff --git a/src/mame/video/mcd212.cpp b/src/mame/video/mcd212.cpp index aec55056c8f..d7912615bbf 100644 --- a/src/mame/video/mcd212.cpp +++ b/src/mame/video/mcd212.cpp @@ -30,7 +30,7 @@ TODO: const device_type MACHINE_MCD212 = &device_creator<mcd212_device>; #if ENABLE_VERBOSE_LOG -INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...) +static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ...) { if( VERBOSE_LEVEL >= n_level ) { @@ -729,7 +729,7 @@ void mcd212_device::process_dca(int channel) m_channel[channel].dca = addr * 2; } -INLINE UINT8 MCD212_LIM(INT32 in) +static inline UINT8 MCD212_LIM(INT32 in) { if(in < 0) { @@ -742,7 +742,7 @@ INLINE UINT8 MCD212_LIM(INT32 in) return (UINT8)in; } -INLINE UINT8 BYTE_TO_CLUT(int channel, int icm, UINT8 byte) +static inline UINT8 BYTE_TO_CLUT(int channel, int icm, UINT8 byte) { switch(icm) { diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp index d0f7330a8d4..7cf60e4f6a5 100644 --- a/src/mame/video/midzeus.cpp +++ b/src/mame/video/midzeus.cpp @@ -114,10 +114,10 @@ static int is_mk4b; * *************************************/ -INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width); -INLINE UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width); -INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width); -INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width); +static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width); +static inline UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width); +static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width); +static inline UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width); /************************************* @@ -160,25 +160,25 @@ INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width); * *************************************/ -INLINE void *waveram0_ptr_from_block_addr(UINT32 addr) +static inline void *waveram0_ptr_from_block_addr(UINT32 addr) { UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 12) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH; return WAVERAM_BLOCK0(blocknum); } -INLINE void *waveram0_ptr_from_expanded_addr(UINT32 addr) +static inline void *waveram0_ptr_from_expanded_addr(UINT32 addr) { UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 16) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH; return WAVERAM_BLOCK0(blocknum); } -INLINE void *waveram1_ptr_from_expanded_addr(UINT32 addr) +static inline void *waveram1_ptr_from_expanded_addr(UINT32 addr) { UINT32 blocknum = (addr % WAVERAM1_WIDTH) + ((addr >> 16) % WAVERAM1_HEIGHT) * WAVERAM1_WIDTH; return WAVERAM_BLOCK1(blocknum); } -INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width) +static inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width) { UINT32 blocknum = (((addr & ~1) * width) / 8) % (WAVERAM0_WIDTH * WAVERAM0_HEIGHT); return WAVERAM_BLOCK0(blocknum); @@ -192,7 +192,7 @@ INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width) * *************************************/ -INLINE void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth) +static inline void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth) { if (zeus_cliprect.contains(x, y)) { @@ -202,13 +202,13 @@ INLINE void waveram_plot_depth(int y, int x, UINT16 color, UINT16 depth) } #ifdef UNUSED_FUNCTION -INLINE void waveram_plot(int y, int x, UINT16 color) +static inline void waveram_plot(int y, int x, UINT16 color) { if (zeus_cliprect.contains(x, y)) WAVERAM_WRITEPIX(zeus_renderbase, y, x, color); } -INLINE void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth) +static inline void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth) { if (zeus_cliprect.contains(x, y)) { @@ -221,7 +221,7 @@ INLINE void waveram_plot_check_depth(int y, int x, UINT16 color, UINT16 depth) } } -INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16 depth) +static inline void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16 depth) { if (zeus_cliprect.contains(x, y)) { @@ -240,26 +240,26 @@ INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT16 color, UINT16 *************************************/ // 4x2 block size -INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width) +static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width) { UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 8) << 3) + ((y & 1) << 2) + ((x / 2) & 3); return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f; } -INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width) +static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width) { UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 4) << 3) + ((y & 1) << 2) + (x & 3); return WAVERAM_READ8(base, byteoffs); } // 2x2 block size -INLINE UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width) +static inline UINT8 get_texel_alt_4bit(const void *base, int y, int x, int width) { UINT32 byteoffs = (y / 4) * (width * 4) + ((x / 4) << 3) + ((y & 3) << 1) + ((x / 2) & 1); return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f; } -INLINE UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width) +static inline UINT8 get_texel_alt_8bit(const void *base, int y, int x, int width) { UINT32 byteoffs = (y / 4) * (width * 4) + ((x / 2) << 3) + ((y & 3) << 1) + (x & 1); return WAVERAM_READ8(base, byteoffs); diff --git a/src/mame/video/midzeus2.cpp b/src/mame/video/midzeus2.cpp index 4b1c3d65689..670af222960 100644 --- a/src/mame/video/midzeus2.cpp +++ b/src/mame/video/midzeus2.cpp @@ -165,20 +165,20 @@ static int subregwrite_count[0x100]; * *************************************/ -INLINE void *waveram0_ptr_from_expanded_addr(UINT32 addr) +static inline void *waveram0_ptr_from_expanded_addr(UINT32 addr) { UINT32 blocknum = (addr % WAVERAM0_WIDTH) + ((addr >> 16) % WAVERAM0_HEIGHT) * WAVERAM0_WIDTH; return WAVERAM_BLOCK0(blocknum); } -INLINE void *waveram1_ptr_from_expanded_addr(UINT32 addr) +static inline void *waveram1_ptr_from_expanded_addr(UINT32 addr) { UINT32 blocknum = (addr % WAVERAM1_WIDTH) + ((addr >> 16) % WAVERAM1_HEIGHT) * WAVERAM1_WIDTH; return WAVERAM_BLOCK1(blocknum); } #ifdef UNUSED_FUNCTION -INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width) +static inline void *waveram0_ptr_from_texture_addr(UINT32 addr, int width) { UINT32 blocknum = ((addr & ~1) * width) / 8; return WAVERAM_BLOCK0(blocknum); @@ -193,14 +193,14 @@ INLINE void *waveram0_ptr_from_texture_addr(UINT32 addr, int width) *************************************/ #ifdef UNUSED_FUNCTION -INLINE void waveram_plot(int y, int x, UINT32 color) +static inline void waveram_plot(int y, int x, UINT32 color) { if (zeus_cliprect.contains(x, y)) WAVERAM_WRITEPIX(zeus_renderbase, y, x, color); } #endif -INLINE void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth) +static inline void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth) { if (zeus_cliprect.contains(x, y)) { @@ -210,7 +210,7 @@ INLINE void waveram_plot_depth(int y, int x, UINT32 color, UINT16 depth) } #ifdef UNUSED_FUNCTION -INLINE void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth) +static inline void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth) { if (zeus_cliprect.contains(x, y)) { @@ -225,7 +225,7 @@ INLINE void waveram_plot_check_depth(int y, int x, UINT32 color, UINT16 depth) #endif #ifdef UNUSED_FUNCTION -INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16 depth) +static inline void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16 depth) { if (zeus_cliprect.contains(x, y)) { @@ -243,7 +243,7 @@ INLINE void waveram_plot_check_depth_nowrite(int y, int x, UINT32 color, UINT16 * *************************************/ -INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width) +static inline UINT8 get_texel_8bit(const void *base, int y, int x, int width) { UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 4) << 3) + ((y & 1) << 2) + (x & 3); return WAVERAM_READ8(base, byteoffs); @@ -251,7 +251,7 @@ INLINE UINT8 get_texel_8bit(const void *base, int y, int x, int width) #ifdef UNUSED_FUNCTION -INLINE UINT8 get_texel_4bit(const void *base, int y, int x, int width) +static inline UINT8 get_texel_4bit(const void *base, int y, int x, int width) { UINT32 byteoffs = (y / 2) * (width * 2) + ((x / 8) << 3) + ((y & 1) << 2) + ((x / 2) & 3); return (WAVERAM_READ8(base, byteoffs) >> (4 * (x & 1))) & 0x0f; diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp index 93d41b28552..8915d2ee5c1 100644 --- a/src/mame/video/model2.cpp +++ b/src/mame/video/model2.cpp @@ -105,7 +105,7 @@ * *******************************************/ -INLINE void transform_point( poly_vertex *point, float *matrix ) +static inline void transform_point( poly_vertex *point, float *matrix ) { float tx = (point->x * matrix[0]) + (point->y * matrix[3]) + (point->pz * matrix[6]) + (matrix[9]); float ty = (point->x * matrix[1]) + (point->y * matrix[4]) + (point->pz * matrix[7]) + (matrix[10]); @@ -116,7 +116,7 @@ INLINE void transform_point( poly_vertex *point, float *matrix ) point->pz = tz; } -INLINE void transform_vector( poly_vertex *vector, float *matrix ) +static inline void transform_vector( poly_vertex *vector, float *matrix ) { float tx = (vector->x * matrix[0]) + (vector->y * matrix[3]) + (vector->pz * matrix[6]); float ty = (vector->x * matrix[1]) + (vector->y * matrix[4]) + (vector->pz * matrix[7]); @@ -127,7 +127,7 @@ INLINE void transform_vector( poly_vertex *vector, float *matrix ) vector->pz = tz; } -INLINE void normalize_vector( poly_vertex *vector ) +static inline void normalize_vector( poly_vertex *vector ) { float n = sqrt( (vector->x * vector->x) + (vector->y * vector->y) + (vector->pz * vector->pz) ); @@ -140,12 +140,12 @@ INLINE void normalize_vector( poly_vertex *vector ) } } -INLINE float dot_product( poly_vertex *v1, poly_vertex *v2 ) +static inline float dot_product( poly_vertex *v1, poly_vertex *v2 ) { return (v1->x * v2->x) + (v1->y * v2->y) + (v1->pz * v2->pz); } -INLINE void vector_cross3( poly_vertex *dst, poly_vertex *v0, poly_vertex *v1, poly_vertex *v2 ) +static inline void vector_cross3( poly_vertex *dst, poly_vertex *v0, poly_vertex *v1, poly_vertex *v2 ) { poly_vertex p1, p2; diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp index 4cea4a5a2e7..9e1e60be5d8 100644 --- a/src/mame/video/model3.cpp +++ b/src/mame/video/model3.cpp @@ -1312,7 +1312,7 @@ WRITE64_MEMBER(model3_state::real3d_cmd_w) /*****************************************************************************/ /* matrix and vector operations */ -INLINE float dot_product3(VECTOR3 a, VECTOR3 b) +static inline float dot_product3(VECTOR3 a, VECTOR3 b) { return (a[0] * b[0]) + (a[1] * b[1]) + (a[2] * b[2]); } diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp index d15d63ac7eb..cf2f73805c6 100644 --- a/src/mame/video/namcofl.cpp +++ b/src/mame/video/namcofl.cpp @@ -11,7 +11,7 @@ * read from 32-bit aligned memory as if it were an array of 16 bit words. */ #ifdef UNUSED_FUNCTION -INLINE UINT16 +static inline UINT16 nth_word32( const UINT32 *source, int which ) { source += which/2; @@ -31,7 +31,7 @@ nth_word32( const UINT32 *source, int which ) * read from 32-bit aligned memory as if it were an array of bytes. */ #ifdef UNUSED_FUNCTION -INLINE UINT8 +static inline UINT8 nth_byte32( const UINT32 *pSource, int which ) { UINT32 data = pSource[which/4]; diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp index cc38da66c8a..007ee859ad5 100644 --- a/src/mame/video/namconb1.cpp +++ b/src/mame/video/namconb1.cpp @@ -10,7 +10,7 @@ /* nth_word32 is a general-purpose utility function, which allows us to * read from 32-bit aligned memory as if it were an array of 16 bit words. */ -INLINE UINT16 +static inline UINT16 nth_word32( const UINT32 *source, int which ) { source += which/2; @@ -27,7 +27,7 @@ nth_word32( const UINT32 *source, int which ) /* nth_byte32 is a general-purpose utility function, which allows us to * read from 32-bit aligned memory as if it were an array of bytes. */ -INLINE UINT8 +static inline UINT8 nth_byte32( const UINT32 *pSource, int which ) { UINT32 data = pSource[which/4]; diff --git a/src/mame/video/namcos2.cpp b/src/mame/video/namcos2.cpp index 96ab3a18de1..d45dd94278d 100644 --- a/src/mame/video/namcos2.cpp +++ b/src/mame/video/namcos2.cpp @@ -64,7 +64,7 @@ struct roz_param int wrap; }; -INLINE void +static inline void draw_roz_helper_block(const struct roz_param *rozInfo, int destx, int desty, int srcx, int srcy, int width, int height, bitmap_ind16 &destbitmap, bitmap_ind8 &flagsbitmap, diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp index 8d331fbb60f..52aff54c3ce 100644 --- a/src/mame/video/newport.cpp +++ b/src/mame/video/newport.cpp @@ -32,7 +32,7 @@ #define VERBOSE_LEVEL ( 0 ) #if 0 -INLINE void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ... ) +static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_level, const char *s_fmt, ... ) { if( VERBOSE_LEVEL >= n_level ) { diff --git a/src/mame/video/rdpfiltr.inc b/src/mame/video/rdpfiltr.inc index 31f10f4858a..019a928a727 100644 --- a/src/mame/video/rdpfiltr.inc +++ b/src/mame/video/rdpfiltr.inc @@ -1,16 +1,16 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz #if 0 -INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres); -INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index); -INLINE void restore_filter16(INT32* r, INT32* g, INT32* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres); -INLINE void divot_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuffer); -INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres); -INLINE void restore_two(color_t* filtered, color_t* neighbour); -INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb); -INLINE UINT32 ge_two(UINT32 enb); - -INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres) +static inline void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres); +static inline void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index); +static inline void restore_filter16(INT32* r, INT32* g, INT32* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres); +static inline void divot_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuffer); +static inline void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres); +static inline void restore_two(color_t* filtered, color_t* neighbour); +static inline void video_max(UINT32* Pixels, UINT8* max, UINT32* enb); +static inline UINT32 ge_two(UINT32 enb); + +static inline void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UINT8* hbuff, const UINT32 hres) { color_t penumax, penumin, max, min; UINT16 pix = *vbuff; @@ -210,7 +210,7 @@ INLINE void video_filter16(int *out_r, int *out_g, int *out_b, UINT16* vbuff, UI } // This needs to be fixed for endianness. -INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index) +static inline void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 fbuff_index) { UINT8 leftr, leftg, leftb, rightr, rightg, rightb; UINT16 leftpix, rightpix; @@ -256,7 +256,7 @@ INLINE void divot_filter16(UINT8* r, UINT8* g, UINT8* b, UINT16* fbuff, UINT32 f } } -INLINE void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer) +static inline void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer) { color_t leftpix = vibuffer[-1]; color_t rightpix = vibuffer[1]; @@ -303,7 +303,7 @@ INLINE void divot_filter16_buffer(int* r, int* g, int* b, color_t* vibuffer) } // Fix me. -INLINE void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres) +static inline void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff_index, UINT32 hres) { INT32 leftuppix = -hres - 1; INT32 leftdownpix = hres - 1; @@ -430,7 +430,7 @@ INLINE void restore_filter16(int* r, int* g, int* b, UINT16* fbuff, UINT32 fbuff } } -INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres) +static inline void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuff, UINT32 hres) { color_t filtered; color_t leftuppix, leftdownpix, leftpix; @@ -474,7 +474,7 @@ INLINE void restore_filter16_buffer(INT32* r, INT32* g, INT32* b, color_t* vibuf } // This is wrong, only the 5 upper bits are compared. -INLINE void restore_two(color_t* filtered, color_t* neighbour) +static inline void restore_two(color_t* filtered, color_t* neighbour) { if (neighbour->i.r > filtered->i.r) { @@ -502,7 +502,7 @@ INLINE void restore_two(color_t* filtered, color_t* neighbour) } } -INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb) +static inline void video_max(UINT32* Pixels, UINT8* max, UINT32* enb) { int i; int pos = 0; @@ -526,7 +526,7 @@ INLINE void video_max(UINT32* Pixels, UINT8* max, UINT32* enb) *max = Pixels[pos]; } -INLINE UINT32 ge_two(UINT32 enb) +static inline UINT32 ge_two(UINT32 enb) { if(enb & 1) { diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp index 34656f1b9b1..3e150303609 100644 --- a/src/mame/video/tatsumi.cpp +++ b/src/mame/video/tatsumi.cpp @@ -169,7 +169,7 @@ VIDEO_START_MEMBER(tatsumi_state,bigfight) /********************************************************************/ template<class _BitmapClass> -INLINE void roundupt_drawgfxzoomrotate(tatsumi_state *state, +static inline void roundupt_drawgfxzoomrotate(tatsumi_state *state, _BitmapClass &dest_bmp, const rectangle &clip, gfx_element *gfx, UINT32 code,UINT32 color,int flipx,int flipy,UINT32 ssx,UINT32 ssy, int scalex, int scaley, int rotate, int write_priority_only ) diff --git a/src/mame/video/victory.cpp b/src/mame/video/victory.cpp index a265f3d3815..99ce602429b 100644 --- a/src/mame/video/victory.cpp +++ b/src/mame/video/victory.cpp @@ -510,7 +510,7 @@ Registers: * *************************************/ -INLINE void count_states(struct micro_t µ, int states) +static inline void count_states(struct micro_t µ, int states) { attotime state_time = MICRO_STATE_CLOCK_PERIOD * states; diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp index 1b968053882..7b2af322548 100644 --- a/src/mame/video/vrender0.cpp +++ b/src/mame/video/vrender0.cpp @@ -116,7 +116,7 @@ no color in the palette will have this value #define RGB32(r,g,b) ((r << 16) | (g << 8) | (b << 0)) #define RGB16(r,g,b) ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3) -INLINE UINT16 RGB32TO16(UINT32 rgb) +static inline UINT16 RGB32TO16(UINT32 rgb) { return (((rgb >> (16 + 3)) & 0x1f) << 11) | (((rgb >> (8 + 2)) & 0x3f) << 5) | (((rgb >> (3)) & 0x1f) << 0); } @@ -125,7 +125,7 @@ INLINE UINT16 RGB32TO16(UINT32 rgb) #define EXTRACTG8(Src) (((Src >> 5) << 2) & 0xff) #define EXTRACTB8(Src) (((Src >> 0) << 3) & 0xff) -INLINE UINT16 Shade(UINT16 Src, UINT32 Shade) +static inline UINT16 Shade(UINT16 Src, UINT32 Shade) { UINT32 scr = (EXTRACTR8(Src) * ((Shade >> 16) & 0xff)) >> 8; UINT32 scg = (EXTRACTG8(Src) * ((Shade >> 8) & 0xff)) >> 8; diff --git a/src/mame/video/wgp.cpp b/src/mame/video/wgp.cpp index 9cd1ef49871..9a7c78b1140 100644 --- a/src/mame/video/wgp.cpp +++ b/src/mame/video/wgp.cpp @@ -477,7 +477,7 @@ void wgp_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const CUSTOM DRAW *********************************************************/ -INLINE void bryan2_drawscanline( bitmap_ind16 &bitmap, int x, int y, int length, +static inline void bryan2_drawscanline( bitmap_ind16 &bitmap, int x, int y, int length, const UINT16 *src, int transparent, UINT32 orient, bitmap_ind8 &priority, int pri ) { UINT16 *dsti = &bitmap.pix16(y, x); |