From 42229ce0095fadb2fba1cf909ed0d1fe930fd978 Mon Sep 17 00:00:00 2001
From: Melissa Goad <alegend45@gmail.com>
Date: Fri, 6 Jan 2017 07:08:53 -0600
Subject: [PATCH] MAJOR overhaul to nVidia PGRAPH object loading

---
 src/vid_nv_riva128.c | 60 ++++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/vid_nv_riva128.c b/src/vid_nv_riva128.c
index 05e06f277..d2a4150ae 100644
--- a/src/vid_nv_riva128.c
+++ b/src/vid_nv_riva128.c
@@ -131,7 +131,7 @@ typedef struct riva128_t
     int pgraph_speedhack;
 
 	  uint32_t obj_handle[8];
-	  uint8_t obj_class[8];
+	  uint16_t obj_class[8];
 
     uint32_t debug[5];
 	
@@ -158,6 +158,8 @@ typedef struct riva128_t
 
     uint32_t notify;
 
+    uint32_t instance;
+
     struct
     {
       uint32_t point_color;
@@ -1054,14 +1056,12 @@ static void riva128_pramdac_write(uint32_t addr, uint32_t val, void *p)
   }
 }
 
-static uint8_t riva128_ramht_lookup(uint32_t handle, void *p)
+static uint32_t riva128_ramht_lookup(uint32_t handle, void *p)
 {
   riva128_t *riva128 = (riva128_t *)p;
   svga_t *svga = &riva128->svga;
   pclog("RIVA 128 RAMHT lookup with handle %08X %04X:%08X\n", handle, CS, cpu_state.pc);
   
-  uint8_t objclass;
-  
   uint32_t ramht_base = riva128->pfifo.ramht_addr;
   
   uint32_t tmp = handle;
@@ -1085,12 +1085,10 @@ static uint8_t riva128_ramht_lookup(uint32_t handle, void *p)
   
   hash ^= riva128->pfifo.caches[1].chanid << (bits - 4);
   
-  objclass = riva128->pramin[ramht_base + (hash * 8)];
-  objclass &= 0xff;
-  return objclass;
+  return riva128->pramin[ramht_base + (hash * 8)];
 }
 
-static void riva128_pgraph_point_exec_method_speedhack(int offset, uint32_t val, void *p)
+/*static void riva128_pgraph_point_exec_method_speedhack(int offset, uint32_t val, void *p)
 {
   riva128_t *riva128 = (riva128_t *)p;
   svga_t *svga = &riva128->svga;
@@ -1183,7 +1181,7 @@ static void riva128_pgraph_exec_method_speedhack(int subchanid, int offset, uint
       break;
     } 
   }
-}
+}*/
 
 static void riva128_puller_exec_method(int chanid, int subchanid, int offset, uint32_t val, void *p)
 {
@@ -1191,21 +1189,39 @@ static void riva128_puller_exec_method(int chanid, int subchanid, int offset, ui
   svga_t *svga = &riva128->svga;
   pclog("RIVA 128 Puller executing method %04X on channel %01X[%01X] %04X:%08X\n", offset, chanid, subchanid, val, CS, cpu_state.pc);
   
+  if(offset < 0x100)
+  {
+    if(offset == 0)
+    {
+      if(riva128->card_id == 0x03)
+      {
+        uint32_t tmp = riva128_ramht_lookup(val, riva128);
+        riva128->pgraph.instance = (tmp & 0xffff) << 4;
+        riva128->pgraph.ctx_switch[0] = riva128->pgraph.ctx_cache[subchanid][0] = riva128->pramin[riva128->pgraph.instance];
+        riva128->pgraph.ctx_user = (chanid << 24) | (tmp & 0xf0000) | (subchanid << 13);
+      }
+      else if(riva128->card_id >= 0x04 && riva128->card_id < 0x10)
+      {
+        riva128->pgraph.ctx_switch[3] = (riva128_ramht_lookup(val, riva128) & 0xffff) << 4;
+        riva128->pgraph.ctx_switch[0] = riva128->pgraph.ctx_cache[subchanid][0] = riva128->pramin[riva128->pgraph.ctx_switch[3]];
+        riva128->pgraph.ctx_switch[1] = riva128->pgraph.ctx_cache[subchanid][1] = riva128->pramin[riva128->pgraph.ctx_switch[3] + 4];
+        riva128->pgraph.ctx_switch[2] = riva128->pgraph.ctx_cache[subchanid][2] = riva128->pramin[riva128->pgraph.ctx_switch[3] + 8];
+        riva128->pgraph.ctx_user = (chanid << 24) | (subchanid << 13);
+      }
+      else if(riva128->card_id >= 0x10 && riva128->card_id < 0x40)
+      {
+        riva128->pgraph.ctx_switch[3] = (riva128_ramht_lookup(val, riva128) & 0xffff) << 4;
+        riva128->pgraph.ctx_switch[0] = riva128->pgraph.ctx_cache[subchanid][0] = riva128->pramin[riva128->pgraph.ctx_switch[3]];
+        riva128->pgraph.ctx_switch[1] = riva128->pgraph.ctx_cache[subchanid][1] = riva128->pramin[riva128->pgraph.ctx_switch[3] + 4];
+        riva128->pgraph.ctx_switch[2] = riva128->pgraph.ctx_cache[subchanid][2] = riva128->pramin[riva128->pgraph.ctx_switch[3] + 8];
+        riva128->pgraph.ctx_switch[4] = riva128->pgraph.ctx_cache[subchanid][4] = riva128->pramin[riva128->pgraph.ctx_switch[3] + 12];
+        riva128->pgraph.ctx_user = (chanid << 24) | (subchanid << 13);
+      }
+    }
+  }
+
   if(riva128->pgraph.pgraph_speedhack)
   {
-    if(offset < 0x100)
-    {
-	    //These methods are executed by the puller itself.
-	    if(offset == 0)
-	    {
-		    riva128->pgraph.obj_handle[subchanid] = val;
-		    riva128->pgraph.obj_class[subchanid] = riva128_ramht_lookup(val, riva128);
-  	  }
-    }
-    else
-    {
-      if(riva128->card_id == 0x03) riva128_pgraph_exec_method_speedhack(subchanid, offset, val, riva128);
-    }
   }
   else
   {