summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-07-29 14:35:25 +0200
committerSergeanur <s.anureev@yandex.ua>2020-07-29 14:35:25 +0200
commit86cc86ac1222e6d84bf148c718a82d6f77b09ecb (patch)
tree346f59276fc0961c1cf564cd2953036d4f2b7b1c
parentMerge branch 'master' into miami (diff)
parentrename shit (diff)
downloadre3-86cc86ac1222e6d84bf148c718a82d6f77b09ecb.tar
re3-86cc86ac1222e6d84bf148c718a82d6f77b09ecb.tar.gz
re3-86cc86ac1222e6d84bf148c718a82d6f77b09ecb.tar.bz2
re3-86cc86ac1222e6d84bf148c718a82d6f77b09ecb.tar.lz
re3-86cc86ac1222e6d84bf148c718a82d6f77b09ecb.tar.xz
re3-86cc86ac1222e6d84bf148c718a82d6f77b09ecb.tar.zst
re3-86cc86ac1222e6d84bf148c718a82d6f77b09ecb.zip
-rw-r--r--src/core/Game.cpp8
-rw-r--r--src/core/config.h2
-rw-r--r--src/rw/RwHelper.cpp2
-rw-r--r--src/rw/RwPS2AlphaTest.cpp (renamed from src/rw/RwDualPass.cpp)4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 75c3773c..7700d321 100644
--- a/src/core/Game.cpp
+++ b/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();
diff --git a/src/core/config.h b/src/core/config.h
index 8d85b3a2..28dbe65d 100644
--- a/src/core/config.h
+++ b/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
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index cabe43f1..7ce1d4f5 100644
--- a/src/rw/RwHelper.cpp
+++ b/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;
diff --git a/src/rw/RwDualPass.cpp b/src/rw/RwPS2AlphaTest.cpp
index c8ebb8ad..c0d68355 100644
--- a/src/rw/RwDualPass.cpp
+++ b/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 \ No newline at end of file