pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored copyall()

Browse source
This commit is contained in:
Dimitris Panokostas 2020-07-12 21:13:16 +02:00
parent 9d6c905320
commit 3c396c051f
1 changed files with 10 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/osdep/picasso96.cpp
View file

@ -4580,41 +4580,23 @@ static void copyall(uae_u8* src, uae_u8* dst, int pwidth, int pheight, int srcby
{ {
struct picasso_vidbuf_description* vidinfo = &picasso_vidinfo; struct picasso_vidbuf_description* vidinfo = &picasso_vidinfo;
struct picasso96_state_struct* state = &picasso96_state; struct picasso96_state_struct* state = &picasso96_state;
if (state->RGBFormat == RGBFB_R5G6B5PC) { if (state->RGBFormat == RGBFB_CLUT)
if (vidinfo->pixbytes == 2) {
{
//copy_screen_16bit_swap(dst, src, state->Width * state->Height * 2);
const auto w = pwidth * vidinfo->pixbytes;
for (auto y = 0; y < pheight; y++)
{
memcpy(dst, src, w);
dst += dstbytesperrow;
src += srcbytesperrow;
}
}
else
copy_screen_16bit_to_32bit(dst, src, state->Width * state->Height * 2);
}
else if (state->RGBFormat == RGBFB_CLUT) {
const auto pixels = state->Width * state->Height; const auto pixels = state->Width * state->Height;
if (vidinfo->pixbytes == 2) if (vidinfo->pixbytes == 2)
copy_screen_8bit_to_16bit(dst, src, pixels, vidinfo->clut); copy_screen_8bit_to_16bit(dst, src, pixels, vidinfo->clut);
else else
copy_screen_8bit_to_32bit(dst, src, pixels, vidinfo->clut); copy_screen_8bit_to_32bit(dst, src, pixels, vidinfo->clut);
} }
else { else
if (vidinfo->pixbytes == 2) {
copy_screen_32bit_to_16bit(dst, src, state->Width * state->Height * 4); // 16-bit and 32-bit modes are direct
else const auto w = pwidth * vidinfo->pixbytes;
for (auto y = 0; y < pheight; y++)
{ {
//copy_screen_32bit_to_32bit(dst, src, state->Width * state->Height * 4); memcpy(dst, src, w);
const auto w = pwidth * vidinfo->pixbytes; dst += dstbytesperrow;
for (auto y = 0; y < pheight; y++) src += srcbytesperrow;
{
memcpy(dst, src, w);
dst += dstbytesperrow;
src += srcbytesperrow;
}
} }
} }
} }