Added ability to use old, incompatible, but faster blitter.

[virtualjaguar] / src / blitter.cpp

diff --git a/src/blitter.cpp b/src/blitter.cpp
index 935e84b900ef690c59902d2fcf6aac4bdf0ead31..6a8c9ca4bafae1ad069cfd534c3414acb86ae513 100644 (file)
--- a/src/blitter.cpp
+++ b/src/blitter.cpp
@@ -28,15 +28,23 @@
 #include "jaguar.h"
 #include "log.h"
 //#include "memory.h"
+#include "settings.h"
 
 // Various conditional compilation goodies...
 
 //#define LOG_BLITS
 
-//#define USE_ORIGINAL_BLITTER
+#define USE_ORIGINAL_BLITTER
 //#define USE_MIDSUMMER_BLITTER
 #define USE_MIDSUMMER_BLITTER_MKII
 
+#ifdef USE_ORIGINAL_BLITTER
+#ifdef USE_MIDSUMMER_BLITTER_MKII
+#define USE_BOTH_BLITTERS
+#endif
+#endif
+
+
 // External global variables
 
 extern int jaguar_active_memory_dumps;
@@ -1725,6 +1733,7 @@ if (blit_start_log)
        WriteLog("BLIT: Blitter started by %s...\n", whoName[who]);
        doGPUDis = true;
 }//*/
+#ifndef USE_BOTH_BLITTERS
 #ifdef USE_ORIGINAL_BLITTER
                blitter_blit(GET32(blitter_ram, 0x38));
 #endif
@@ -1734,6 +1743,14 @@ if (blit_start_log)
 #ifdef USE_MIDSUMMER_BLITTER_MKII
                BlitterMidsummer2();
 #endif
+#else
+       {
+               if (vjs.useFastBlitter)
+                       blitter_blit(GET32(blitter_ram, 0x38));
+               else
+                       BlitterMidsummer2();
+       }
+#endif
 }
 //F02278,9,A,B