Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 02:07:14 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

psikyosh.cpp : Updates

Browse Source 
Reduce duplicates, Fix spacing, Use shorter / correct type values
This commit is contained in:
cam900 2019-09-10 00:04:30 +09:00
parent 3f4fcc06b8
commit b4447af0ba
2 changed files with 117 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mame/drivers/psikyosh.cpp
View File

@ -403,7 +403,7 @@ P1KEY11 29|30 P2KEY11
KEY11 = 0x0800 // JAMMA P1 Button 1 KEY11 = 0x0800 // JAMMA P1 Button 1
}; // Mahjong->JAMMA mapping specific to this game pcb }; // Mahjong->JAMMA mapping specific to this game pcb
u16 key_codes[] = { // treated as IP_ACTIVE_LOW, game inverts them upon reading static const u16 key_codes[] = { // treated as IP_ACTIVE_LOW, game inverts them upon reading
// ROW (distinct pins for P1 or P2) | COLUMN (shared for P1+P2) // ROW (distinct pins for P1 or P2) | COLUMN (shared for P1+P2)
KEY4 | KEY3, // A KEY4 | KEY3, // A
KEY4 | KEY2, // B KEY4 | KEY2, // B
@ -437,7 +437,7 @@ P1KEY11 29|30 P2KEY11
value |= 0xFFFF0000; // set top word value |= 0xFFFF0000; // set top word
do { do {
// since we can't handle multiple keys, just return the first one depressed // since we can't handle multiple keys, just return the first one depressed
if((keys & which_key) && (count < ARRAY_LENGTH(key_codes))) if ((keys & which_key) && (count < ARRAY_LENGTH(key_codes)))
{ {
value &= ~((u32)(key_codes[count]) << 16); // mask in selected word as IP_ACTIVE_LOW value &= ~((u32)(key_codes[count]) << 16); // mask in selected word as IP_ACTIVE_LOW
break; break;

247
src/mame/video/psikyosh.cpp
View File

@ -77,7 +77,7 @@ static constexpr u32 BG_TRANSPEN = 0x00ff00ff; // used for representing transpar
#define PIXEL_OP_COPY_TRANSPEN_ARGBRENDER32(DEST, PRIORITY, SOURCE) \ #define PIXEL_OP_COPY_TRANSPEN_ARGBRENDER32(DEST, PRIORITY, SOURCE) \
do \ do \
{ \ { \
rgb_t srcdata = (SOURCE); \ const rgb_t srcdata = (SOURCE); \
if (srcdata != transpen) \ if (srcdata != transpen) \
(DEST) = alpha_blend_r32((DEST), srcdata, srcdata.a()); \ (DEST) = alpha_blend_r32((DEST), srcdata, srcdata.a()); \
} \ } \
@ -86,7 +86,7 @@ while (0)
#define PIXEL_OP_COPY_TRANSPEN_ALPHARENDER32(DEST, PRIORITY, SOURCE) \ #define PIXEL_OP_COPY_TRANSPEN_ALPHARENDER32(DEST, PRIORITY, SOURCE) \
do \ do \
{ \ { \
u32 srcdata = (SOURCE); \ const u32 srcdata = (SOURCE); \
if (srcdata != transpen) \ if (srcdata != transpen) \
(DEST) = alpha_blend_r32((DEST), srcdata, alpha); \ (DEST) = alpha_blend_r32((DEST), srcdata, alpha); \
} \ } \
@ -95,12 +95,74 @@ while (0)
#define PIXEL_OP_COPY_TRANSPEN_RENDER32(DEST, PRIORITY, SOURCE) \ #define PIXEL_OP_COPY_TRANSPEN_RENDER32(DEST, PRIORITY, SOURCE) \
do \ do \
{ \ { \
u32 srcdata = (SOURCE); \ const u32 srcdata = (SOURCE); \
if (srcdata != transpen) \ if (srcdata != transpen) \
(DEST) = srcdata; \ (DEST) = srcdata; \
} \ } \
while (0) while (0)
static inline void pixop_transparent_priority(u8 source, u32 *dest, u16 *pri, const pen_t *pal, u16 z)
{
if (z >= *pri)
{
if (source != 0)
{
*dest = pal[source];
*pri = z;
}
}
}
static inline void pixop_transparent(u8 source, u32 *dest, const pen_t *pal)
{
if (source != 0)
*dest = pal[source];
}
static inline void pixop_transparent_alpha_priority(u8 source, u32 *dest, u16 *pri, const pen_t *pal, u16 z, s16 alpha)
{
if (z >= *pri)
{
if (source != 0)
{
*dest = alpha_blend_r32(*dest, pal[source], alpha);
*pri = z;
}
}
}
static inline void pixop_transparent_alpha(u8 source, u32 *dest, const pen_t *pal, s16 alpha)
{
if (source != 0)
*dest = alpha_blend_r32(*dest, pal[source], alpha);
}
static inline void pixop_transparent_alphatable_priority(u8 source, u32 *dest, u16 *pri, const pen_t *pal, u16 z, u8 *alphatable)
{
if (z >= *pri)
{
if (source != 0)
{
if (alphatable[source] == 0xff)
*dest = pal[source];
else
*dest = alpha_blend_r32(*dest, pal[source], alphatable[source]);
*pri = z;
}
}
}
static inline void pixop_transparent_alphatable(u8 source, u32 *dest, const pen_t *pal, u8 *alphatable)
{
if (source != 0)
{
if (alphatable[source] == 0xff)
*dest = pal[source];
else
*dest = alpha_blend_r32(*dest, pal[source], alphatable[source]);
}
}
/*------------------------------------------------- /*-------------------------------------------------
draw_scanline32_alpha - take an RGB-encoded u32 draw_scanline32_alpha - take an RGB-encoded u32
scanline and alpha-blend it into the destination bitmap scanline and alpha-blend it into the destination bitmap
@ -108,7 +170,7 @@ while (0)
void psikyosh_state::draw_scanline32_alpha(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr, int alpha) void psikyosh_state::draw_scanline32_alpha(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr, int alpha)
{ {
DECLARE_NO_PRIORITY; DECLARE_NO_PRIORITY;
u32 transpen = BG_TRANSPEN; u32 const transpen = BG_TRANSPEN;
DRAWSCANLINE_CORE(u32, PIXEL_OP_COPY_TRANSPEN_ALPHARENDER32, NO_PRIORITY); DRAWSCANLINE_CORE(u32, PIXEL_OP_COPY_TRANSPEN_ALPHARENDER32, NO_PRIORITY);
} }
@ -120,7 +182,7 @@ void psikyosh_state::draw_scanline32_alpha(bitmap_rgb32 &bitmap, s32 destx, s32
void psikyosh_state::draw_scanline32_argb(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr) void psikyosh_state::draw_scanline32_argb(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr)
{ {
DECLARE_NO_PRIORITY; DECLARE_NO_PRIORITY;
u32 transpen = BG_TRANSPEN; u32 const transpen = BG_TRANSPEN;
DRAWSCANLINE_CORE(u32, PIXEL_OP_COPY_TRANSPEN_ARGBRENDER32, NO_PRIORITY); DRAWSCANLINE_CORE(u32, PIXEL_OP_COPY_TRANSPEN_ARGBRENDER32, NO_PRIORITY);
} }
@ -132,7 +194,7 @@ void psikyosh_state::draw_scanline32_argb(bitmap_rgb32 &bitmap, s32 destx, s32 d
void psikyosh_state::draw_scanline32_transpen(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr) void psikyosh_state::draw_scanline32_transpen(bitmap_rgb32 &bitmap, s32 destx, s32 desty, s32 length, const u32 *srcptr)
{ {
DECLARE_NO_PRIORITY; DECLARE_NO_PRIORITY;
u32 transpen = BG_TRANSPEN; u32 const transpen = BG_TRANSPEN;
DRAWSCANLINE_CORE(u32, PIXEL_OP_COPY_TRANSPEN_RENDER32, NO_PRIORITY); DRAWSCANLINE_CORE(u32, PIXEL_OP_COPY_TRANSPEN_RENDER32, NO_PRIORITY);
} }
@ -243,13 +305,13 @@ void psikyosh_state::draw_bglayerscroll(u8 const layer, bitmap_rgb32 &bitmap, co
u8 const size = BG_LARGE(layer) ? 32 : 16; u8 const size = BG_LARGE(layer) ? 32 : 16;
u16 const height = size * 16; u16 const height = size * 16;
u8 linebank = BG_TYPE(layer); u8 const linebank = BG_TYPE(layer);
/* cache rendered bitmap */ /* cache rendered bitmap */
u8 last_bank[32]; // corresponds to bank of bitmap in m_bg_bitmap. bg_bitmap is split into 16/32-rows of one-tile high each u8 last_bank[32]; // corresponds to bank of bitmap in m_bg_bitmap. bg_bitmap is split into 16/32-rows of one-tile high each
for (auto & elem : last_bank) elem = -1; for (auto & elem : last_bank) elem = -1;
int scr_width = cliprect.width(); int const scr_width = cliprect.width();
u32 *scroll_reg = &m_spriteram[(linebank * 0x800) / 4 + cliprect.top()]; u32 *scroll_reg = &m_spriteram[(linebank * 0x800) / 4 + cliprect.top()];
u32 *pzab_reg = &m_spriteram[(linebank * 0x800) / 4 + cliprect.top() + 0x400 / 4]; // pri, zoom, alpha, bank u32 *pzab_reg = &m_spriteram[(linebank * 0x800) / 4 + cliprect.top() + 0x400 / 4]; // pri, zoom, alpha, bank
@ -259,7 +321,7 @@ void psikyosh_state::draw_bglayerscroll(u8 const layer, bitmap_rgb32 &bitmap, co
// write it with alpha // write it with alpha
for (int scanline = cliprect.top(); scanline <= cliprect.bottom(); scanline++) for (int scanline = cliprect.top(); scanline <= cliprect.bottom(); scanline++)
{ {
u8 pri = (*pzab_reg & 0xff000000) >> 24; u8 const pri = (*pzab_reg & 0xff000000) >> 24;
if (pri == req_pri) if (pri == req_pri)
{ {
@ -428,25 +490,25 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
if (sx < myclip.left()) if (sx < myclip.left())
{ /* clip left */ { /* clip left */
int pixels = myclip.left() - sx; const int pixels = myclip.left() - sx;
sx += pixels; sx += pixels;
x_index_base += xinc * pixels; x_index_base += xinc * pixels;
} }
if (sy < myclip.top()) if (sy < myclip.top())
{ /* clip top */ { /* clip top */
int pixels = myclip.top() - sy; const int pixels = myclip.top() - sy;
sy += pixels; sy += pixels;
y_index += yinc * pixels; y_index += yinc * pixels;
} }
/* NS 980211 - fixed incorrect clipping */ /* NS 980211 - fixed incorrect clipping */
if (ex > myclip.right() + 1) if (ex > myclip.right() + 1)
{ /* clip right */ { /* clip right */
int pixels = ex - myclip.right() - 1; const int pixels = ex - myclip.right() - 1;
ex -= pixels; ex -= pixels;
} }
if (ey > myclip.bottom() + 1) if (ey > myclip.bottom() + 1)
{ /* clip bottom */ { /* clip bottom */
int pixels = ey - myclip.bottom() - 1; const int pixels = ey - myclip.bottom() - 1;
ey -= pixels; ey -= pixels;
} }
@ -461,22 +523,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
const u8 *source = code_base + (y_index) * gfx->rowbytes() + x_index_base; const u8 *source = code_base + (y_index) * gfx->rowbytes() + x_index_base;
u32 *dest = &dest_bmp.pix32(sy, sx); u32 *dest = &dest_bmp.pix32(sy, sx);
u16 *pri = &m_z_bitmap.pix16(sy, sx); u16 *pri = &m_z_bitmap.pix16(sy, sx);
int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx); const int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx);
int dst_modulo = dest_bmp.rowpixels() - (ex - sx); const int dst_modulo = dest_bmp.rowpixels() - (ex - sx);
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
if (z >= *pri) pixop_transparent_priority(*source, dest, pri, pal, z);
{
const u8 c = *source;
if (c != 0)
{
*dest = pal[c];
*pri = z;
}
}
dest++; dest++;
pri++; pri++;
source += xinc; source += xinc;
@ -490,17 +544,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base; const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base;
u32 *dest = &dest_bmp.pix32(sy, sx); u32 *dest = &dest_bmp.pix32(sy, sx);
int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx); const int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx);
int dst_modulo = dest_bmp.rowpixels() - (ex - sx); const int dst_modulo = dest_bmp.rowpixels() - (ex - sx);
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
const u8 c = *source; pixop_transparent(*source, dest, pal);
if (c != 0)
*dest = pal[c];
dest++; dest++;
source += xinc; source += xinc;
} }
@ -518,22 +569,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base; const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base;
u32 *dest = &dest_bmp.pix32(sy, sx); u32 *dest = &dest_bmp.pix32(sy, sx);
u16 *pri = &m_z_bitmap.pix16(sy, sx); u16 *pri = &m_z_bitmap.pix16(sy, sx);
int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx); const int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx);
int dst_modulo = dest_bmp.rowpixels() - (ex - sx); const int dst_modulo = dest_bmp.rowpixels() - (ex - sx);
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
if (z >= *pri) pixop_transparent_alpha_priority(*source, dest, pri, pal, z, alpha);
{
const u8 c = *source;
if (c != 0)
{
*dest = alpha_blend_r32(*dest, pal[c], alpha);
*pri = z;
}
}
dest++; dest++;
pri++; pri++;
source += xinc; source += xinc;
@ -547,17 +590,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base; const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base;
u32 *dest = &dest_bmp.pix32(sy, sx); u32 *dest = &dest_bmp.pix32(sy, sx);
int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx); const int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx);
int dst_modulo = dest_bmp.rowpixels() - (ex - sx); const int dst_modulo = dest_bmp.rowpixels() - (ex - sx);
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
const u8 c = *source; pixop_transparent_alpha(*source, dest, pal, alpha);
if (c != 0)
*dest = alpha_blend_r32(*dest, pal[c], alpha);
dest++; dest++;
source += xinc; source += xinc;
} }
@ -576,26 +616,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base; const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base;
u32 *dest = &dest_bmp.pix32(sy, sx); u32 *dest = &dest_bmp.pix32(sy, sx);
u16 *pri = &m_z_bitmap.pix16(sy, sx); u16 *pri = &m_z_bitmap.pix16(sy, sx);
int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx); const int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx);
int dst_modulo = dest_bmp.rowpixels() - (ex - sx); const int dst_modulo = dest_bmp.rowpixels() - (ex - sx);
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
if (z >= *pri) pixop_transparent_alphatable_priority(*source, dest, pri, pal, z, m_alphatable.get());
{
const u8 c = *source;
if (c != 0)
{
if (m_alphatable[c] == 0xff)
*dest = pal[c];
else
*dest = alpha_blend_r32(*dest, pal[c], m_alphatable[c]);
*pri = z;
}
}
dest++; dest++;
pri++; pri++;
source += xinc; source += xinc;
@ -609,21 +637,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base; const u8 *source = code_base + y_index * gfx->rowbytes() + x_index_base;
u32 *dest = &dest_bmp.pix32(sy, sx); u32 *dest = &dest_bmp.pix32(sy, sx);
int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx); const int src_modulo = yinc * gfx->rowbytes() - xinc * (ex - sx);
int dst_modulo = dest_bmp.rowpixels() - (ex - sx); const int dst_modulo = dest_bmp.rowpixels() - (ex - sx);
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
const u8 c = *source; pixop_transparent_alphatable(*source, dest, pal, m_alphatable.get());
if (c != 0)
{
if (m_alphatable[c] == 0xff)
*dest = pal[c];
else
*dest = alpha_blend_r32(*dest, pal[c], m_alphatable[c]);
}
dest++; dest++;
source += xinc; source += xinc;
} }
@ -665,8 +686,8 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
const pen_t *pal = &m_palette->pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors())); const pen_t *pal = &m_palette->pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors()));
int sprite_screen_height = ((high * gfx->height() * (0x400 * 0x400)) / zoomy + 0x200) >> 10; /* Round up to nearest pixel */ const int sprite_screen_height = ((high * gfx->height() * (0x400 * 0x400)) / zoomy + 0x200) >> 10; /* Round up to nearest pixel */
int sprite_screen_width = ((wide * gfx->width() * (0x400 * 0x400)) / zoomx + 0x200) >> 10; const int sprite_screen_width = ((wide * gfx->width() * (0x400 * 0x400)) / zoomx + 0x200) >> 10;
if (sprite_screen_width && sprite_screen_height) if (sprite_screen_width && sprite_screen_height)
{ {
@ -691,25 +712,25 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
if (sx < myclip.left()) if (sx < myclip.left())
{ /* clip left */ { /* clip left */
int pixels = myclip.left() - sx; const int pixels = myclip.left() - sx;
sx += pixels; sx += pixels;
x_index_base += pixels * dx; x_index_base += pixels * dx;
} }
if (sy < myclip.top()) if (sy < myclip.top())
{ /* clip top */ { /* clip top */
int pixels = myclip.top() - sy; const int pixels = myclip.top() - sy;
sy += pixels; sy += pixels;
y_index += pixels * dy; y_index += pixels * dy;
} }
/* NS 980211 - fixed incorrect clipping */ /* NS 980211 - fixed incorrect clipping */
if (ex > myclip.right() + 1) if (ex > myclip.right() + 1)
{ /* clip right */ { /* clip right */
int pixels = ex-myclip.right() - 1; const int pixels = ex-myclip.right() - 1;
ex -= pixels; ex -= pixels;
} }
if (ey > myclip.bottom() + 1) if (ey > myclip.bottom() + 1)
{ /* clip bottom */ { /* clip bottom */
int pixels = ey-myclip.bottom() - 1; const int pixels = ey-myclip.bottom() - 1;
ey -= pixels; ey -= pixels;
} }
@ -724,22 +745,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
u8 *source = &m_zoom_bitmap.pix8(y_index >> 10); const u8 *source = &m_zoom_bitmap.pix8(y_index >> 10);
u32 *dest = &dest_bmp.pix32(y); u32 *dest = &dest_bmp.pix32(y);
u16 *pri = &m_z_bitmap.pix16(y); u16 *pri = &m_z_bitmap.pix16(y);
int x_index = x_index_base; int x_index = x_index_base;
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
if (z >= pri[x]) pixop_transparent_priority(source[x_index >> 10], &dest[x], &pri[x], pal, z);
{
const u8 c = source[x_index >> 10];
if (c != 0)
{
dest[x] = pal[c];
pri[x] = z;
}
}
x_index += dx; x_index += dx;
} }
@ -750,15 +763,13 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
u8 *source = &m_zoom_bitmap.pix8(y_index >> 10); const u8 *source = &m_zoom_bitmap.pix8(y_index >> 10);
u32 *dest = &dest_bmp.pix32(y); u32 *dest = &dest_bmp.pix32(y);
int x_index = x_index_base; int x_index = x_index_base;
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
const u8 c = source[x_index >> 10]; pixop_transparent(source[x_index >> 10], &dest[x], pal);
if (c != 0)
dest[x] = pal[c];
x_index += dx; x_index += dx;
} }
@ -774,22 +785,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
u8 *source = &m_zoom_bitmap.pix8(y_index >> 10); const u8 *source = &m_zoom_bitmap.pix8(y_index >> 10);
u32 *dest = &dest_bmp.pix32(y); u32 *dest = &dest_bmp.pix32(y);
u16 *pri = &m_z_bitmap.pix16(y); u16 *pri = &m_z_bitmap.pix16(y);
int x_index = x_index_base; int x_index = x_index_base;
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
if (z >= pri[x]) pixop_transparent_alpha_priority(source[x_index >> 10], &dest[x], &pri[x], pal, z, alpha);
{
const u8 c = source[x_index >> 10];
if (c != 0)
{
dest[x] = alpha_blend_r32(dest[x], pal[c], alpha);
pri[x] = z;
}
}
x_index += dx; x_index += dx;
} }
@ -800,14 +803,13 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
u8 *source = &m_zoom_bitmap.pix8(y_index >> 10); const u8 *source = &m_zoom_bitmap.pix8(y_index >> 10);
u32 *dest = &dest_bmp.pix32(y); u32 *dest = &dest_bmp.pix32(y);
int x_index = x_index_base; int x_index = x_index_base;
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
const u8 c = source[x_index >> 10]; pixop_transparent_alpha(source[x_index >> 10], &dest[x], pal, alpha);
if (c != 0) dest[x] = alpha_blend_r32(dest[x], pal[c], alpha);
x_index += dx; x_index += dx;
} }
@ -823,26 +825,14 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
u8 *source = &m_zoom_bitmap.pix8(y_index >> 10); const u8 *source = &m_zoom_bitmap.pix8(y_index >> 10);
u32 *dest = &dest_bmp.pix32(y); u32 *dest = &dest_bmp.pix32(y);
u16 *pri = &m_z_bitmap.pix16(y); u16 *pri = &m_z_bitmap.pix16(y);
int x_index = x_index_base; int x_index = x_index_base;
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
if (z >= pri[x]) pixop_transparent_alphatable_priority(source[x_index >> 10], &dest[x], &pri[x], pal, z, m_alphatable.get());
{
const u8 c = source[x_index >> 10];
if (c != 0)
{
if (m_alphatable[c] == 0xff)
dest[x] = pal[c];
else
dest[x] = alpha_blend_r32(dest[x], pal[c], m_alphatable[c]);
pri[x] = z;
}
}
x_index += dx; x_index += dx;
} }
@ -853,20 +843,13 @@ void psikyosh_state::psikyosh_drawgfxzoom(bitmap_rgb32 &dest_bmp, const rectangl
{ {
for (int y = sy; y < ey; y++) for (int y = sy; y < ey; y++)
{ {
u8 *source = &m_zoom_bitmap.pix8(y_index >> 10); const u8 *source = &m_zoom_bitmap.pix8(y_index >> 10);
u32 *dest = &dest_bmp.pix32(y); u32 *dest = &dest_bmp.pix32(y);
int x_index = x_index_base; int x_index = x_index_base;
for (int x = sx; x < ex; x++) for (int x = sx; x < ex; x++)
{ {
const u8 c = source[x_index >> 10]; pixop_transparent_alphatable(source[x_index >> 10], &dest[x], pal, m_alphatable.get());
if (c != 0)
{
if (m_alphatable[c] == 0xff)
dest[x] = pal[c];
else
dest[x] = alpha_blend_r32(dest[x], pal[c], m_alphatable[c]);
}
x_index += dx; x_index += dx;
} }
@ -981,7 +964,7 @@ void psikyosh_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprec
while (sprite_ptr != m_sprite_end) while (sprite_ptr != m_sprite_end)
{ {
u8 bg_pri = SPRITE_PRI(sprite_ptr->bg_pri); u8 const bg_pri = SPRITE_PRI(sprite_ptr->bg_pri);
// sprite vs backgrounds pri // sprite vs backgrounds pri
if (bg_pri == req_pri) if (bg_pri == req_pri)
{ {
@ -1025,7 +1008,7 @@ void psikyosh_state::prelineblend(bitmap_rgb32 &bitmap, const rectangle &cliprec
gnbarich sets the 0x000000ff to 0x7f in test mode whilst the others use 0x80. gnbarich sets the 0x000000ff to 0x7f in test mode whilst the others use 0x80.
tgm2 sets it to 0x00 on warning screen. Likely has no effect. */ tgm2 sets it to 0x00 on warning screen. Likely has no effect. */
u8 const bank = (m_vidregs[7] & 0xff000000) >> 24; /* bank is always 8 (0x4000) except for daraku/soldivid */ u8 const bank = (m_vidregs[7] & 0xff000000) >> 24; /* bank is always 8 (0x4000) except for daraku/soldivid */
u32 *linefill = &m_spriteram[(bank * 0x800) / 4]; /* Per row */ u32 const *linefill = &m_spriteram[(bank * 0x800) / 4]; /* Per row */
assert(bitmap.bpp() == 32); assert(bitmap.bpp() == 32);
@ -1046,7 +1029,7 @@ void psikyosh_state::postlineblend(bitmap_rgb32 &bitmap, const rectangle &clipre
{ {
/* There are 224 values for post-lineblending. Using one for every row currently */ /* There are 224 values for post-lineblending. Using one for every row currently */
u8 const bank = (m_vidregs[7] & 0xff000000) >> 24; /* bank is always 8 (i.e. 0x4000) except for daraku/soldivid */ u8 const bank = (m_vidregs[7] & 0xff000000) >> 24; /* bank is always 8 (i.e. 0x4000) except for daraku/soldivid */
u32 *lineblend = &m_spriteram[(bank * 0x800) / 4 + 0x400 / 4]; /* Per row */ u32 const *lineblend = &m_spriteram[(bank * 0x800) / 4 + 0x400 / 4]; /* Per row */
assert(bitmap.bpp() == 32); assert(bitmap.bpp() == 32);
@ -1094,7 +1077,7 @@ void psikyosh_state::video_start()
} }
for (i = 0; i < 0x40; i++) for (i = 0; i < 0x40; i++)
{ {
int alpha = pal6bit(0x3f - i); int const alpha = pal6bit(0x3f - i);
m_alphatable[i + 0xc0] = alpha; m_alphatable[i + 0xc0] = alpha;
} }