--- uae/src/linetoscr.c 2018/04/24 17:05:28 1.1.1.4 +++ uae/src/linetoscr.c 2018/04/24 17:12:22 1.1.1.5 @@ -1,21 +1,21 @@ -static int LNAME (int spix, int dpix, int stoppos) +static NOINLINE int LNAME (int spix, int dpix, int stoppos) { TYPE *buf = ((TYPE *)xlinebuffer); uae_u8 xor_val; - if (AGA) xor_val = (uae_u8)(dp_for_drawing->bplcon4 >> 8); + if (AGAC) xor_val = (uae_u8)(dp_for_drawing->bplcon4 >> 8); if (dp_for_drawing->ham_seen) { /* HAM 6 / HAM 8 */ while (dpix < stoppos) { - TYPE d = AGA ? CONVERT_RGB (ham_linebuf[spix]) : xcolors[ham_linebuf[spix]]; + TYPE d = AGAC ? CONVERT_RGB (ham_linebuf[spix]) : xcolors[ham_linebuf[spix]]; spix += SRC_INC; buf[dpix++] = d; if (HDOUBLE) buf[dpix++] = d; } } else if (bpldualpf) { - if (AGA) { + if (AGAC) { /* AGA Dual playfield */ int *lookup = bpldualpfpri ? dblpf_ind2_aga : dblpf_ind1_aga; int *lookup_no = bpldualpfpri ? dblpf_2nd2 : dblpf_2nd1; @@ -53,7 +53,7 @@ static int LNAME (int spix, int dpix, in int p = pixdata.apixels[spix]; TYPE d = colors_for_drawing.acolors[p]; spix += SRC_INC; - if (AGA) { + if (AGAC) { /* AGA EHB playfield */ if (p>= 32 && p < 64) /* FIXME: what about sprite colors between 32 and 64? */ d = (colors_for_drawing.color_regs_aga[(p-32)^xor_val] >> 1) & 0x7F7F7F; @@ -68,7 +68,7 @@ static int LNAME (int spix, int dpix, in } } else { while (dpix < stoppos) { - TYPE d = (AGA ? colors_for_drawing.acolors[pixdata.apixels[spix]^xor_val] + TYPE d = (AGAC ? colors_for_drawing.acolors[pixdata.apixels[spix]^xor_val] : colors_for_drawing.acolors[pixdata.apixels[spix]]); spix += SRC_INC; buf[dpix++] = d; @@ -82,4 +82,4 @@ static int LNAME (int spix, int dpix, in #undef LNAME #undef HDOUBLE #undef SRC_INC -#undef AGA +#undef AGAC