(Libsnes - core2-console) pfPlot and pfRip function pointers for

SuperFX ripped out
libretro · Oct 25, 2011 · e9c304a · e9c304a
1 parent b10e16d
commit e9c304a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/src/snes9x-core2-console/fxemu.cpp b/src/snes9x-core2-console/fxemu.cpp
@@ -242,13 +242,10 @@ static void fx_readRegisterSpace (void)
 	if (GSU.pvScreenBase + GSU.vScreenSize > GSU.pvRam + (GSU.nRamBanks * 65536))
 		GSU.pvScreenBase = GSU.pvRam + (GSU.nRamBanks * 65536) - GSU.vScreenSize;
 
-	GSU.pfPlot = fx_PlotTable[GSU.vMode];
-	GSU.pfRpix = fx_PlotTable[GSU.vMode + 5];
-
-	fx_OpcodeTable[0x04c] = GSU.pfPlot;
-	fx_OpcodeTable[0x14c] = GSU.pfRpix;
-	fx_OpcodeTable[0x24c] = GSU.pfPlot;
-	fx_OpcodeTable[0x34c] = GSU.pfRpix;
+	fx_OpcodeTable[0x04c] = fx_PlotTable[GSU.vMode];
+	fx_OpcodeTable[0x14c] = fx_PlotTable[GSU.vMode + 5];
+	fx_OpcodeTable[0x24c] = fx_PlotTable[GSU.vMode];
+	fx_OpcodeTable[0x34c] = fx_PlotTable[GSU.vMode + 5];
 
 	fx_computeScreenPointers();
 
@@ -575,13 +572,6 @@ void S9xSuperFXExec (void)
 	}
 }
 
-
-
-
-
-
-
-
 void fx_computeScreenPointers (void)
 {
 	if (GSU.vMode != GSU.vPrevMode || GSU.vPrevScreenHeight != GSU.vScreenHeight || GSU.vSCBRDirty)

diff --git a/src/snes9x-core2-console/fxinst.h b/src/snes9x-core2-console/fxinst.h
@@ -355,8 +355,6 @@ struct FxRegs_s
 	uint32	vScreenRealHeight;			// 128, 160, 192 or 256
 	uint32	vPrevScreenHeight;
 	uint32	vScreenSize;
-	void	(*pfPlot) (void);
-	void	(*pfRpix) (void);
 
 	uint8	*pvRamBank;					// Pointer to current RAM-bank
 	uint8	*pvRomBank;					// Pointer to current ROM-bank

diff --git a/src/snes9x-core2-console/snapshot.cpp b/src/snes9x-core2-console/snapshot.cpp
@@ -1567,13 +1567,7 @@ int S9xUnfreezeFromStream (STREAM stream)
 
 		S9xControlPostLoadState(&ctl_snap);
 
-	#ifndef ZSNES_FX
-		if (local_superfx)
-		{
-			GSU.pfPlot = fx_PlotTable[GSU.vMode];
-			GSU.pfRpix = fx_PlotTable[GSU.vMode + 5];
-		}
-	#else
+	#ifdef ZSNES_FX
 		if (Settings.SuperFX)
 			S9xSuperFXPostLoadState();
 	#endif

diff --git a/src/snes9x-core2-console/snes9x.h b/src/snes9x-core2-console/snes9x.h
@@ -346,7 +346,7 @@ struct STimings
 	int32	WRAMRefreshPos;
 	int32	RenderPos;
 	bool8	InterlaceField;
-	int32	DMACPUSync;		// The cycles to synchronize DMA and CPU. Snes9x cannot emulate correctly.
+	int32	DMACPUSync;	// The cycles to synchronize DMA and CPU. Snes9x cannot emulate correctly.
 	int32	NMIDMADelay;	// The delay of NMI trigger after DMA transfers. Snes9x cannot emulate correctly.
 	int32	IRQPendCount;	// This value is just a hack, because Snes9x cannot emulate any events in an opcode.
 	int32	APUSpeedup;