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

Removes TRANSPARENCY_BLEND completely and TRANSPARENCY_BLEND_RAW as an option to copybitmap. Source tree needs to be recompiled as the transparancy mode enum has changed.

Browse Source
This commit is contained in:
Zsolt Vasvari 2008-01-27 07:48:31 +00:00
parent 07410a78d8
commit 10b4ed5a2d
2 changed files with 0 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
src/emu/drawgfx.c
View File

@ -1073,17 +1073,6 @@ void copyscrollbitmap(mame_bitmap *dest,mame_bitmap *src,
int srcwidth,srcheight,destwidth,destheight; int srcwidth,srcheight,destwidth,destheight;
rectangle orig_clip; rectangle orig_clip;
/* translate to proper transparency here */
if (transparency == TRANSPARENCY_NONE)
transparency = TRANSPARENCY_NONE_RAW;
else if (transparency == TRANSPARENCY_PEN)
transparency = TRANSPARENCY_PEN_RAW;
else if (transparency == TRANSPARENCY_COLOR)
{
transparent_color = Machine->pens[transparent_color];
transparency = TRANSPARENCY_PEN_RAW;
}
if (clip) if (clip)
{ {
orig_clip.min_x = clip->min_x; orig_clip.min_x = clip->min_x;
@ -4712,156 +4701,6 @@ DECLARE(blockmove_NtoN_opaque_noremap_flipx,(
} }
}) })
DECLARE(blockmove_NtoN_blend_noremap,(
const DATA_TYPE *srcdata,int srcwidth,int srcheight,int srcmodulo,
DATA_TYPE *dstdata,int dstmodulo,
int srcshift),
{
DATA_TYPE *end;
srcmodulo -= srcwidth;
dstmodulo -= srcwidth;
while (srcheight)
{
end = dstdata + srcwidth;
while (dstdata <= end - 8)
{
dstdata[0] |= srcdata[0] << srcshift;
dstdata[1] |= srcdata[1] << srcshift;
dstdata[2] |= srcdata[2] << srcshift;
dstdata[3] |= srcdata[3] << srcshift;
dstdata[4] |= srcdata[4] << srcshift;
dstdata[5] |= srcdata[5] << srcshift;
dstdata[6] |= srcdata[6] << srcshift;
dstdata[7] |= srcdata[7] << srcshift;
dstdata += 8;
srcdata += 8;
}
while (dstdata < end)
*(dstdata++) |= *(srcdata++) << srcshift;
srcdata += srcmodulo;
dstdata += dstmodulo;
srcheight--;
}
})
DECLARE(blockmove_NtoN_blend_noremap_flipx,(
const DATA_TYPE *srcdata,int srcwidth,int srcheight,int srcmodulo,
DATA_TYPE *dstdata,int dstmodulo,
int srcshift),
{
DATA_TYPE *end;
srcmodulo += srcwidth;
dstmodulo -= srcwidth;
while (srcheight)
{
end = dstdata + srcwidth;
while (dstdata <= end - 8)
{
srcdata -= 8;
dstdata[0] |= srcdata[8] << srcshift;
dstdata[1] |= srcdata[7] << srcshift;
dstdata[2] |= srcdata[6] << srcshift;
dstdata[3] |= srcdata[5] << srcshift;
dstdata[4] |= srcdata[4] << srcshift;
dstdata[5] |= srcdata[3] << srcshift;
dstdata[6] |= srcdata[2] << srcshift;
dstdata[7] |= srcdata[1] << srcshift;
dstdata += 8;
}
while (dstdata < end)
*(dstdata++) |= *(srcdata--) << srcshift;
srcdata += srcmodulo;
dstdata += dstmodulo;
srcheight--;
}
})
DECLARE(blockmove_NtoN_blend_remap,(
const DATA_TYPE *srcdata,int srcwidth,int srcheight,int srcmodulo,
DATA_TYPE *dstdata,int dstmodulo,
const pen_t *paldata,int srcshift),
{
DATA_TYPE *end;
srcmodulo -= srcwidth;
dstmodulo -= srcwidth;
while (srcheight)
{
end = dstdata + srcwidth;
while (dstdata <= end - 8)
{
dstdata[0] = paldata[dstdata[0] | (srcdata[0] << srcshift)];
dstdata[1] = paldata[dstdata[1] | (srcdata[1] << srcshift)];
dstdata[2] = paldata[dstdata[2] | (srcdata[2] << srcshift)];
dstdata[3] = paldata[dstdata[3] | (srcdata[3] << srcshift)];
dstdata[4] = paldata[dstdata[4] | (srcdata[4] << srcshift)];
dstdata[5] = paldata[dstdata[5] | (srcdata[5] << srcshift)];
dstdata[6] = paldata[dstdata[6] | (srcdata[6] << srcshift)];
dstdata[7] = paldata[dstdata[7] | (srcdata[7] << srcshift)];
dstdata += 8;
srcdata += 8;
}
while (dstdata < end)
{
*dstdata = paldata[*dstdata | (*(srcdata++) << srcshift)];
dstdata++;
}
srcdata += srcmodulo;
dstdata += dstmodulo;
srcheight--;
}
})
DECLARE(blockmove_NtoN_blend_remap_flipx,(
const DATA_TYPE *srcdata,int srcwidth,int srcheight,int srcmodulo,
DATA_TYPE *dstdata,int dstmodulo,
const pen_t *paldata,int srcshift),
{
DATA_TYPE *end;
srcmodulo += srcwidth;
dstmodulo -= srcwidth;
while (srcheight)
{
end = dstdata + srcwidth;
while (dstdata <= end - 8)
{
srcdata -= 8;
dstdata[0] = paldata[dstdata[0] | (srcdata[8] << srcshift)];
dstdata[1] = paldata[dstdata[1] | (srcdata[7] << srcshift)];
dstdata[2] = paldata[dstdata[2] | (srcdata[6] << srcshift)];
dstdata[3] = paldata[dstdata[3] | (srcdata[5] << srcshift)];
dstdata[4] = paldata[dstdata[4] | (srcdata[4] << srcshift)];
dstdata[5] = paldata[dstdata[5] | (srcdata[3] << srcshift)];
dstdata[6] = paldata[dstdata[6] | (srcdata[2] << srcshift)];
dstdata[7] = paldata[dstdata[7] | (srcdata[1] << srcshift)];
dstdata += 8;
}
while (dstdata < end)
{
*dstdata = paldata[*dstdata | (*(srcdata--) << srcshift)];
dstdata++;
}
srcdata += srcmodulo;
dstdata += dstmodulo;
srcheight--;
}
})
DECLARE(drawgfx_core,( DECLARE(drawgfx_core,(
mame_bitmap *dest,const gfx_element *gfx, mame_bitmap *dest,const gfx_element *gfx,
@ -5118,9 +4957,7 @@ DECLARE(copybitmap_core,(
int dm = dest->rowpixels; /* dest modulo */ int dm = dest->rowpixels; /* dest modulo */
if (flipx) if (flipx)
{
sd += src->width -1 -(sx-ox); sd += src->width -1 -(sx-ox);
}
else else
sd += (sx-ox); sd += (sx-ox);
@ -5142,14 +4979,6 @@ DECLARE(copybitmap_core,(
BLOCKMOVE(NtoN_transpen_noremap,flipx,(sd,sw,sh,sm,dd,dm,transparent_color)); BLOCKMOVE(NtoN_transpen_noremap,flipx,(sd,sw,sh,sm,dd,dm,transparent_color));
break; break;
case TRANSPARENCY_BLEND:
BLOCKMOVE(NtoN_blend_remap,flipx,(sd,sw,sh,sm,dd,dm,Machine->pens,transparent_color));
break;
case TRANSPARENCY_BLEND_RAW:
BLOCKMOVE(NtoN_blend_noremap,flipx,(sd,sw,sh,sm,dd,dm,transparent_color));
break;
default: default:
popmessage("copybitmap pen mode not supported"); popmessage("copybitmap pen mode not supported");
break; break;

1
src/emu/drawgfx.h
View File

@ -59,7 +59,6 @@ enum
TRANSPARENCY_COLOR, /* single remapped pen transparency with remapping */ TRANSPARENCY_COLOR, /* single remapped pen transparency with remapping */
TRANSPARENCY_PEN_TABLE, /* special pen remapping modes (see DRAWMODE_xxx below) with remapping */ TRANSPARENCY_PEN_TABLE, /* special pen remapping modes (see DRAWMODE_xxx below) with remapping */
TRANSPARENCY_PEN_TABLE_RAW, /* special pen remapping modes (see DRAWMODE_xxx below) with no remapping */ TRANSPARENCY_PEN_TABLE_RAW, /* special pen remapping modes (see DRAWMODE_xxx below) with no remapping */
TRANSPARENCY_BLEND, /* blend two bitmaps, shifting the source and ORing to the dest with remapping */
TRANSPARENCY_BLEND_RAW, /* blend two bitmaps, shifting the source and ORing to the dest with no remapping */ TRANSPARENCY_BLEND_RAW, /* blend two bitmaps, shifting the source and ORing to the dest with no remapping */
TRANSPARENCY_ALPHA, /* single pen transparency, other pens alpha */ TRANSPARENCY_ALPHA, /* single pen transparency, other pens alpha */
TRANSPARENCY_ALPHARANGE, /* single pen transparency, multiple pens alpha depending on array, see psikyosh.c */ TRANSPARENCY_ALPHARANGE, /* single pen transparency, multiple pens alpha depending on array, see psikyosh.c */