From 6be600ecc3932eb3eb806390814b9ace758272ec Mon Sep 17 00:00:00 2001 From: Melissa Goad Date: Wed, 16 Nov 2016 16:46:48 -0600 Subject: [PATCH] Double oops --- src/vid_nv_riva128.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/vid_nv_riva128.c b/src/vid_nv_riva128.c index 39eceb222..f8e7250ec 100644 --- a/src/vid_nv_riva128.c +++ b/src/vid_nv_riva128.c @@ -119,6 +119,8 @@ typedef struct riva128_t { uint32_t obj_handle[8]; uint8_t obj_class[8]; + + uint32_t debug[4]; uint32_t intr; uint32_t intr_en; @@ -704,10 +706,12 @@ static void riva128_pgraph_write(uint32_t addr, uint32_t val, void *p) riva128->pgraph.oclip_ymax = val & 0x3ffff; break; case 0x400640: - uint32_t tmp = val & 0x7f800000; - if(val & 0x80000000) tmp = 0; - riva128->pgraph.beta = tmp; - break; + { + uint32_t tmp = val & 0x7f800000; + if(val & 0x80000000) tmp = 0; + riva128->pgraph.beta = tmp; + break; + } } } @@ -822,7 +826,7 @@ static void riva128_pgraph_exec_method(int subchanid, int offset, uint32_t val, { riva128_t *riva128 = (riva128_t *)p; svga_t *svga = &riva128->svga; - pclog("RIVA 128 PGRAPH executing method %04X with object class on channel %01X %04X:%08X\n", offset, riva128->pgraph.obj_class[subchanid], chanid, val, CS, cpu_state.pc); + pclog("RIVA 128 PGRAPH executing method %04X with object class on subchannel %01X %04X:%08X\n", offset, riva128->pgraph.obj_class[subchanid], subchanid, val, CS, cpu_state.pc); switch(riva128->pgraph.obj_class[subchanid]) {