From 6f1c83849629051a02e04fe113b3737aa3db4d9c Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 31 Oct 2019 18:14:04 +0100 Subject: [PATCH] The S3 cards now no longer do mixing or ROP's for PIX_TRANS reads. --- src/video/vid_s3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index c0d0d0b03..7915e5544 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -8,7 +8,7 @@ * * S3 emulation. * - * Version: @(#)vid_s3.c 1.0.27 2019/10/30 + * Version: @(#)vid_s3.c 1.0.28 2019/10/31 * * Authors: Sarah Walker, * Miran Grca, @@ -2660,7 +2660,8 @@ void s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat if (s3_cpu_dest(s3)) { for (i = 0; i <= s3->bpp; i++) - s3->accel.pix_trans[read + i] = (dest_dat >> (i << 3)) & 0xff; + s3->accel.pix_trans[read + i] = (src_dat >> (i << 3)) & 0xff; + /* Yes, src_dat is correct, there is no mixing/ROP's done on PIX_TRANS reads. */ } else WRITE(s3->accel.dest + s3->accel.cx); }