diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2016-12-31 01:19:27 +0000 |
|---|---|---|
| committer | Marcin Kościelnicki <koriakin@0x04.net> | 2016-12-31 01:19:27 +0000 |
| commit | f3a6b4e3c8d08a9d2b16e388b7cafb9f28701497 (patch) | |
| tree | 535ef1fb3c3e3d23d0bd71916824c62a3399e7f2 | |
| parent | 565b7b76449f53d1aeb70a487011dc96c9c1873b (diff) | |
hwtest/pgraph: A few DVD fixes.
| -rw-r--r-- | hwtest/pgraph_class_sifm.cc | 2 | ||||
| -rw-r--r-- | hwtest/pgraph_class_surf.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hwtest/pgraph_class_sifm.cc b/hwtest/pgraph_class_sifm.cc index c28b15f7..99ab6017 100644 --- a/hwtest/pgraph_class_sifm.cc +++ b/hwtest/pgraph_class_sifm.cc @@ -651,7 +651,7 @@ std::vector<SingleMthdTest *> Dvd::mthds() { new MthdSifmXy(opt, rnd(), "xy", 5, cls, 0x300), new MthdSifmRect(opt, rnd(), "rect", 6, cls, 0x304), new MthdSurfDvdFormat(opt, rnd(), "surf_format", 7, cls, 0x308), - new MthdSurfOffset(opt, rnd(), "surf_offset", 8, cls, 0x30c, 4, SURF_NV10), + new MthdSurfOffset(opt, rnd(), "surf_offset", 8, cls, 0x30c, 4, cls == 0x88 ? SURF_NV10 : SURF_NV4), new MthdSifmDuDx(opt, rnd(), "src.dudx", 9, cls, 0x310, 0), new MthdSifmDvDy(opt, rnd(), "src.dvdy", 10, cls, 0x314, 0), new MthdSifmSrcSize(opt, rnd(), "src.size", 11, cls, 0x318, 0), diff --git a/hwtest/pgraph_class_surf.cc b/hwtest/pgraph_class_surf.cc index c3f91252..2480897c 100644 --- a/hwtest/pgraph_class_surf.cc +++ b/hwtest/pgraph_class_surf.cc @@ -303,7 +303,7 @@ bool MthdSurfOffset::is_valid_val() { int ekind = kind; if (chipset.card_type < 0x20 && cls == 0x88) ekind = SURF_NV4; - if (chipset.card_type >= 0x20 && kind == SURF_NV4 && extr(exp.debug[3], 6, 1)) + if (chipset.card_type >= 0x20 && ekind == SURF_NV4 && extr(exp.debug[3], 6, 1)) ekind = SURF_NV10; if (ekind == SURF_NV3) return !(val & 0xf); |