Fixes in the controller config for MacOSX, added option to turn off GPU.

[virtualjaguar] / src / jaguar.cpp

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index 7e2640f045caa67e1319543b1b218a8b45785e76..2cf99dbb09f5e23146858d75d5781cfc4a6c5894 100644 (file)
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -1604,17 +1604,12 @@ void JaguarReset(void)
 //Need to change this so it uses the single RAM space and load the BIOS
 //into it somewhere...
 //Also, have to change this here and in JaguarReadXX() currently
-       // Only use the system BIOS if it's available...!
-       if (vjs.useJaguarBIOS && (biosAvailable & (BIOS_NORMAL | BIOS_STUB1 | BIOS_STUB2)))
-//             memcpy(jaguarMainRAM, jaguarBootROM, 8);
-//             memcpy(jaguarMainRAM, jaguarDevBootROM1, 8);
-               memcpy(jaguarMainRAM, &jagMemSpace[0xE00000], 8);
+       // Only use the system BIOS if it's available...! (it's always available now!)
+       if (vjs.useJaguarBIOS && !vjs.hardwareTypeAlpine)
+               memcpy(jaguarMainRAM, jagMemSpace + 0xE00000, 8);
        else
                SET32(jaguarMainRAM, 4, jaguarRunAddress);
 
-       if (vjs.useJaguarBIOS && !(biosAvailable & (BIOS_NORMAL | BIOS_STUB1 | BIOS_STUB2)))
-               WriteLog("Jaguar: Requested BIOS, but none available.\n");
-
 //     WriteLog("jaguar_reset():\n");
        TOMReset();
        JERRYReset();
@@ -1822,7 +1817,8 @@ if (effect_start)
                BUTCHExec(RISCCyclesPerScanline);
 //if (start_logging)
 //     WriteLog("About to execute GPU (%u)...\n", i);
-               GPUExec(RISCCyclesPerScanline);
+               if (vjs.GPUEnabled)
+                       GPUExec(RISCCyclesPerScanline);
 
                if (vjs.DSPEnabled)
                {
@@ -1973,7 +1969,9 @@ void JaguarExecuteNew(void)
 //WriteLog("JEN: Time to next event (%u) is %f usec (%u RISC cycles)...\n", nextEvent, timeToNextEvent, USEC_TO_RISC_CYCLES(timeToNextEvent));
 
                m68k_execute(USEC_TO_M68K_CYCLES(timeToNextEvent));
-               GPUExec(USEC_TO_RISC_CYCLES(timeToNextEvent));
+
+               if (vjs.GPUEnabled)
+                       GPUExec(USEC_TO_RISC_CYCLES(timeToNextEvent));
 
                if (vjs.DSPEnabled)
                {