From 617ffb77636c9c5dcccf09f6fd5b03b2af9ba66c Mon Sep 17 00:00:00 2001 From: Marcin Kościelnicki Date: Wed, 28 Dec 2016 18:43:54 +0000 Subject: hwtest/pgraph: Add combine bypass detection for EmuD3D6 methods. --- hwtest/pgraph_class_emu_d3d56.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hwtest/pgraph_class_emu_d3d56.cc b/hwtest/pgraph_class_emu_d3d56.cc index 6b5589db..b521eaff 100644 --- a/hwtest/pgraph_class_emu_d3d56.cc +++ b/hwtest/pgraph_class_emu_d3d56.cc @@ -255,6 +255,16 @@ class MthdEmuD3D6CombineControl : public SingleMthdTest { int which, ac; void adjust_orig_mthd() override { if (rnd() & 1) { + if (rnd() & 1) { + if (rnd() & 7) + insrt(val, 0, 5, 0x10); + if (rnd() & 7) + insrt(val, 8, 5, 0x05); + if (rnd() & 7) + insrt(val, 16, 5, 0x04); + if (rnd() & 7) + insrt(val, 24, 5, 0x04); + } val &= ~0x00e0e0e0; if (rnd() & 1) { val ^= 1 << (rnd() & 0x1f); @@ -347,8 +357,9 @@ class MthdEmuD3D6CombineControl : public SingleMthdTest { if (which == 0) { insrt(exp.celsius_config_c, 16 + ac, 1, !t1); } else { - insrt(exp.celsius_config_c, 18 + ac, 1, 0); - insrt(exp.celsius_rc_out[1][1], 28, 3, 2); + bool bypass = (val & 0x1f1f1f1f) == 0x04040510; + insrt(exp.celsius_config_c, 18 + ac, 1, bypass); + insrt(exp.celsius_rc_out[1][1], 28, 2, extr(exp.celsius_config_c, 18, 2) == 3 ? 1 : 2); if (ac == 1) exp.celsius_tex_control[0] = 0x4003ffc0; } -- cgit v1.2.3