Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

konami/simpsons.cpp: Cleanups #13312

Merged
merged 4 commits into from
Feb 7, 2025
+103 −123
Merged

konami/simpsons.cpp: Cleanups #13312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99f3680
konami/simpsons.cpp: Cleanups
cam900 Feb 1, 2025
4b9cbe1
konami/konami_helper.h, konami/simpsons.cpp: Addressing PR comments
cam900 Feb 7, 2025
76dc2c1
Merge branch 'master' of https://github.com/mamedev/mame into simpson…
cam900 Feb 7, 2025
d7ebf32
konami/simpsons.cpp: Don't need if - while will be skipped entirely i…
cuavas Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions src/mame/konami/konami_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,65 +14,3 @@ void konami_decode_gfx(device_gfx_interface &gfxdecode, int gfx_index, uint8_t *
gl.total = total;
gfxdecode.set_gfx(gfx_index, std::make_unique<gfx_element>(&palette, gl, data, 0, palette.entries() >> bpp, 0));
}


/* useful function to sort three tile layers by priority order */
void konami_sortlayers3( int *layer, int *pri )
{
#define SWAP(a,b) \
if (pri[a] < pri[b]) \
{ \
int t; \
t = pri[a]; pri[a] = pri[b]; pri[b] = t; \
t = layer[a]; layer[a] = layer[b]; layer[b] = t; \
}

SWAP(0,1)
SWAP(0,2)
SWAP(1,2)
#undef SWAP
}

/* useful function to sort four tile layers by priority order */
void konami_sortlayers4( int *layer, int *pri )
{
#define SWAP(a,b) \
if (pri[a] <= pri[b]) \
{ \
int t; \
t = pri[a]; pri[a] = pri[b]; pri[b] = t; \
t = layer[a]; layer[a] = layer[b]; layer[b] = t; \
}

SWAP(0, 1)
SWAP(0, 2)
SWAP(0, 3)
SWAP(1, 2)
SWAP(1, 3)
SWAP(2, 3)
#undef SWAP
}

/* useful function to sort five tile layers by priority order */
void konami_sortlayers5( int *layer, int *pri )
{
#define SWAP(a,b) \
if (pri[a] <= pri[b]) \
{ \
int t; \
t = pri[a]; pri[a] = pri[b]; pri[b] = t; \
t = layer[a]; layer[a] = layer[b]; layer[b] = t; \
}

SWAP(0, 1)
SWAP(0, 2)
SWAP(0, 3)
SWAP(0, 4)
SWAP(1, 2)
SWAP(1, 3)
SWAP(1, 4)
SWAP(2, 3)
SWAP(2, 4)
SWAP(3, 4)
#undef SWAP
}
40 changes: 37 additions & 3 deletions src/mame/konami/konami_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,47 @@

#pragma once

#include <algorithm>
#include <functional>

void konami_decode_gfx(device_gfx_interface &gfxdecode, int gfx_index, uint8_t *data, uint32_t total, const gfx_layout *layout, int bpp);

// unrolled bubble sort helper
template <unsigned N, unsigned A = N - 2, unsigned B = N - 1, typename C, typename T, typename U>
inline void konami_sortlayers(C cmp, T *layer, U *pri)
{
if constexpr (B > (A + 1))
konami_sortlayers<N, A, B - 1>(cmp, layer, pri);
else if constexpr (A > 0)
konami_sortlayers<N, A - 1, N - 1>(cmp, layer, pri);
if (cmp(pri[A], pri[B]))
{
using std::swap;
swap(pri[A], pri[B]);
swap(layer[A], layer[B]);
}
}

// helper function to sort three tile layers by priority order
void konami_sortlayers3(int *layer, int *pri);
template <typename T, typename U>
inline void konami_sortlayers3(T *layer, U *pri)
{
konami_sortlayers<3>(std::less<U>(), layer, pri);
}

// helper function to sort four tile layers by priority order
void konami_sortlayers4(int *layer, int *pri);
template <typename T, typename U>
inline void konami_sortlayers4(T *layer, U *pri)
{
konami_sortlayers<4>(std::less_equal<U>(), layer, pri);
}

// helper function to sort five tile layers by priority order
void konami_sortlayers5(int *layer, int *pri);
template <typename T, typename U>
inline void konami_sortlayers5(T *layer, U *pri)
{
konami_sortlayers<5>(std::less_equal<U>(), layer, pri);
}


#endif // MAME_KONAMI_KONAMI_HELPER_H
Loading
Loading