Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-07 01:16:22 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

nw, fix Clang compile

Browse Source
This commit is contained in:
therealmogminer@gmail.com 2015-06-24 16:25:13 +02:00
parent e4b2a43b96
commit bc23c001b5
4 changed files with 17 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/emu/video/rgbgen.h
View File

@ -200,20 +200,6 @@ public:
m_b <<= shift; m_b <<= shift;
} }
inline void shl_imm_all(const UINT8 shift)
{
if (shift == 0)
return;
m_a <<= shift;
m_a |= m_r >> (32 - shift);
m_r <<= shift;
m_r |= m_g >> (32 - shift);
m_g <<= shift;
m_g |= m_b >> (32 - shift);
m_b <<= shift;
}
inline void shr(const rgbaint_t& shift) inline void shr(const rgbaint_t& shift)
{ {
m_a >>= shift.m_a; m_a >>= shift.m_a;
@ -233,20 +219,6 @@ public:
m_b >>= shift; m_b >>= shift;
} }
inline void shr_imm_all(const UINT8 shift)
{
if (shift == 0)
return;
m_b >>= shift;
m_b |= m_g << (32 - shift);
m_g >>= shift;
m_g |= m_r << (32 - shift);
m_r >>= shift;
m_r |= m_a << (32 - shift);
m_a >>= shift;
}
inline void sra(const rgbaint_t& shift) inline void sra(const rgbaint_t& shift)
{ {
m_a >>= shift.m_a; m_a >>= shift.m_a;

10
src/emu/video/rgbsse.h
View File

@ -200,11 +200,6 @@ public:
m_value = _mm_slli_epi32(m_value, shift); m_value = _mm_slli_epi32(m_value, shift);
} }
inline void shl_imm_all(const UINT8 shift)
{
m_value = _mm_slli_si128(m_value, shift >> 3);
}
inline void shr(const rgbaint_t& shift) inline void shr(const rgbaint_t& shift)
{ {
m_value = _mm_srl_epi32(m_value, shift.m_value); m_value = _mm_srl_epi32(m_value, shift.m_value);
@ -215,11 +210,6 @@ public:
m_value = _mm_srli_epi32(m_value, shift); m_value = _mm_srli_epi32(m_value, shift);
} }
inline void shr_imm_all(const UINT8 shift)
{
m_value = _mm_srli_si128(m_value, shift >> 3);
}
inline void sra(const rgbaint_t& shift) inline void sra(const rgbaint_t& shift)
{ {
m_value = _mm_sra_epi32(m_value, shift.m_value); m_value = _mm_sra_epi32(m_value, shift.m_value);

14
src/emu/video/rgbvmx.h
View File

@ -230,13 +230,6 @@ public:
m_value = vec_sl(m_value, temp); m_value = vec_sl(m_value, temp);
} }
inline void shl_imm_all(const UINT8 shift)
{
const vector unsigned char limit = { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 };
const vector unsigned char temp = { shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift };
m_value = vec_and(vec_slo(m_value, temp), (vector unsigned int)vec_cmpgt(limit, temp));
}
inline void shr(const rgbaint_t& shift) inline void shr(const rgbaint_t& shift)
{ {
const vector unsigned int limit = { 32, 32, 32, 32 }; const vector unsigned int limit = { 32, 32, 32, 32 };
@ -250,13 +243,6 @@ public:
m_value = vec_sr(m_value, temp); m_value = vec_sr(m_value, temp);
} }
inline void shr_imm_all(const UINT8 shift)
{
const vector unsigned char limit = { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 };
const vector unsigned char temp = { shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift, shift };
m_value = vec_and(vec_sro(m_value, temp), (vector unsigned int)vec_cmpgt(limit, temp));
}
inline void sra(const rgbaint_t& shift) inline void sra(const rgbaint_t& shift)
{ {
const vector unsigned int limit = { 31, 31, 31, 31 }; const vector unsigned int limit = { 31, 31, 31, 31 };

38
src/mame/video/rdptpipe.c
View File

@ -61,19 +61,23 @@ void n64_texture_pipe_t::set_machine(running_machine &machine)
} }
} }
m_st2_add.set(0, 1, 0, 1); m_st2_add.set(1, 0, 1, 0);
m_v1.set(1, 1, 1, 1); m_v1.set(1, 1, 1, 1);
} }
void n64_texture_pipe_t::mask(rgbaint_t& st, const n64_tile_t& tile) void n64_texture_pipe_t::mask(rgbaint_t& st, const n64_tile_t& tile)
{ {
UINT32 s_mask_bits = m_maskbits_table[tile.mask_s];
UINT32 t_mask_bits = m_maskbits_table[tile.mask_t];
rgbaint_t maskbits(s_mask_bits, s_mask_bits, t_mask_bits, t_mask_bits);
rgbaint_t wrap(st); rgbaint_t wrap(st);
wrap.sra(tile.wrapped_mask); wrap.sra(tile.wrapped_mask);
wrap.and_reg(m_v1); wrap.and_reg(m_v1);
wrap.cmpeq(m_v1); wrap.cmpeq(m_v1);
wrap.and_reg(tile.mm); wrap.and_reg(tile.mm);
st.xor_reg(wrap); st.xor_reg(wrap);
st.and_reg(rgbaint_t(0, m_maskbits_table[tile.mask_s], 0, m_maskbits_table[tile.mask_t])); st.and_reg(maskbits);
} }
void n64_texture_pipe_t::mask_coupled(rgbaint_t& sstt, const n64_tile_t& tile) void n64_texture_pipe_t::mask_coupled(rgbaint_t& sstt, const n64_tile_t& tile)
@ -239,21 +243,16 @@ void n64_texture_pipe_t::cycle_linear(color_t* TEX, color_t* prev, INT32 SSS, IN
const n64_tile_t& tile = object.m_tiles[tilenum]; const n64_tile_t& tile = object.m_tiles[tilenum];
const UINT32 index = (tile.format << 4) | (tile.size << 2) | ((UINT32) object.m_other_modes.en_tlut << 1) | (UINT32) object.m_other_modes.tlut_type; const UINT32 index = (tile.format << 4) | (tile.size << 2) | ((UINT32) object.m_other_modes.en_tlut << 1) | (UINT32) object.m_other_modes.tlut_type;
rgbaint_t st1(0, SSS, 0, SST); rgbaint_t st(0, SSS, 0, SST);
rgbaint_t maxst = shift_cycle(st1, tile); rgbaint_t maxst = shift_cycle(st, tile);
rgbaint_t stfrac(st1); rgbaint_t stfrac(st);
stfrac.and_imm(0x1f); stfrac.and_imm(0x1f);
clamp_cycle(st1, stfrac, maxst, tilenum, tile, userdata); clamp_cycle(st, stfrac, maxst, tilenum, tile, userdata);
rgbaint_t sstt(st1); mask_coupled(st, tile);
sstt.add(m_st2_add);
sstt.shl_imm_all(32);
sstt.or_reg(st1);
mask_coupled(sstt, tile); const UINT32 tbase = tile.tmem + ((tile.line * st.get_b32()) & 0x1ff);
const UINT32 tbase = tile.tmem + ((tile.line * st1.get_b32()) & 0x1ff);
bool upper = ((stfrac.get_r32() + stfrac.get_b32()) >= 0x20); bool upper = ((stfrac.get_r32() + stfrac.get_b32()) >= 0x20);
@ -272,7 +271,7 @@ void n64_texture_pipe_t::cycle_linear(color_t* TEX, color_t* prev, INT32 SSS, IN
stfrac.shl_imm(3); stfrac.shl_imm(3);
rgbaint_t t0; rgbaint_t t0;
((this)->*(m_texel_fetch[index]))(t0, st1.get_r32(), st1.get_b32(), tbase, tile.palette, userdata); ((this)->*(m_texel_fetch[index]))(t0, st.get_r32(), st.get_b32(), tbase, tile.palette, userdata);
if (object.m_other_modes.convert_one && cycle) if (object.m_other_modes.convert_one && cycle)
{ {
t0.set(*prev); t0.set(*prev);
@ -299,17 +298,14 @@ void n64_texture_pipe_t::cycle_linear_lerp(color_t* TEX, color_t* prev, INT32 SS
UINT32 tpal = tile.palette; UINT32 tpal = tile.palette;
UINT32 index = (tile.format << 4) | (tile.size << 2) | ((UINT32) object.m_other_modes.en_tlut << 1) | (UINT32) object.m_other_modes.tlut_type; UINT32 index = (tile.format << 4) | (tile.size << 2) | ((UINT32) object.m_other_modes.en_tlut << 1) | (UINT32) object.m_other_modes.tlut_type;
rgbaint_t st1(0, SSS, 0, SST); rgbaint_t sstt(SSS, SSS, SST, SST);
rgbaint_t maxst = shift_cycle(st1, tile); rgbaint_t maxst = shift_cycle(sstt, tile);
rgbaint_t stfrac = st1; rgbaint_t stfrac = sstt;
stfrac.and_imm(0x1f); stfrac.and_imm(0x1f);
clamp_cycle(st1, stfrac, maxst, tilenum, tile, userdata); clamp_cycle(sstt, stfrac, maxst, tilenum, tile, userdata);
rgbaint_t sstt(st1);
sstt.add(m_st2_add); sstt.add(m_st2_add);
sstt.shl_imm_all(32);
sstt.or_reg(st1);
mask_coupled(sstt, tile); mask_coupled(sstt, tile);