Merge remote-tracking branch 'origin/master' into miami

src/core/Game.cpp

@@ -156,9 +156,9 @@ CGame::InitialiseOnceBeforeRW(void)
 #ifdef PS2_MATFX
 void ReplaceMatFxCallback();
 #endif // PS2_MATFX
-#ifdef DUAL_PASS_RENDERING
+#ifdef PS2_ALPHA_TEST
 void ReplaceAtomicPipeCallback();
-#endif // DUAL_PASS_RENDERING
+#endif // PS2_ALPHA_TEST
 #endif // !LIBRW
 
 bool
@@ -215,9 +215,9 @@ CGame::InitialiseRenderWare(void)
 #ifdef PS2_MATFX
 	ReplaceMatFxCallback();
 #endif // PS2_MATFX
-#ifdef DUAL_PASS_RENDERING
+#ifdef PS2_ALPHA_TEST
 	ReplaceAtomicPipeCallback();
-#endif // DUAL_PASS_RENDERING
+#endif // PS2_ALPHA_TEST
 #endif // LIBRW
 	
 	CFont::Initialise();

src/core/config.h

@@ -214,7 +214,7 @@ enum Config {
 #define ASPECT_RATIO_SCALE	// Not just makes everything scale with aspect ratio, also adds support for all aspect ratios
 #define DEFAULT_NATIVE_RESOLUTION	// Set default video mode to your native resolution (fixes Windows 10 launch)
 #define USE_TXD_CDIMAGE		// generate and load textures from txd.img
-#define DUAL_PASS_RENDERING // dual pass rendering from SkyGfx 
+#define PS2_ALPHA_TEST		// emulate ps2 alpha test 
 #define IMPROVED_VIDEOMODE	// save and load videomode parameters instead of a magic number
 //#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
 //#define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU

src/rw/RwHelper.cpp

@@ -11,7 +11,7 @@
 RtCharset *debugCharset;
 #endif
 
-#ifdef DUAL_PASS_RENDERING
+#ifdef PS2_ALPHA_TEST
 bool gPS2alphaTest = true;
 #else
 bool gPS2alphaTest = false;

src/rw/RwPS2AlphaTest.cpp

@@ -2,7 +2,7 @@
 
 #define WITHD3D
 #include "common.h"
-#ifdef DUAL_PASS_RENDERING
+#ifdef PS2_ALPHA_TEST
 #include "rwcore.h"
 
 extern "C" {
@@ -242,6 +242,6 @@ ReplaceAtomicPipeCallback()
 	                                _rxD3D8DualPassRenderCallback);
 }
 
-#endif // DUAL_PASS_RENDERING
+#endif // PS2_ALPHA_TEST
 
 #endif // !LIBRW