Add RD_ENABLED when VULKAN_ENABLED or D3D12_ENABLED is added

godotengine · Dec 25, 2023 · 078bfae · 078bfae
1 parent 9d1cbab
commit 078bfae
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/drivers/d3d12/SCsub b/drivers/d3d12/SCsub
@@ -5,8 +5,6 @@ from pathlib import Path
 
 Import("env")
 
-env.Append(CPPDEFINES=["RD_ENABLED"])
-
 env_d3d12_rdd = env.Clone()
 
 thirdparty_obj = []

diff --git a/drivers/vulkan/SCsub b/drivers/vulkan/SCsub
@@ -2,8 +2,6 @@
 
 Import("env")
 
-env.Append(CPPDEFINES=["RD_ENABLED"])
-
 thirdparty_obj = []
 thirdparty_dir = "#thirdparty/vulkan"
 thirdparty_volk_dir = "#thirdparty/volk"

diff --git a/platform/android/detect.py b/platform/android/detect.py
@@ -200,7 +200,7 @@ def configure(env: "Environment"):
     env.Append(LIBS=["OpenSLES", "EGL", "android", "log", "z", "dl"])
 
     if env["vulkan"]:
-        env.Append(CPPDEFINES=["VULKAN_ENABLED"])
+        env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
         if not env["use_volk"]:
             env.Append(LIBS=["vulkan"])
 

diff --git a/platform/ios/detect.py b/platform/ios/detect.py
@@ -152,7 +152,7 @@ def configure(env: "Environment"):
     env.Append(CPPDEFINES=["IOS_ENABLED", "UNIX_ENABLED", "COREAUDIO_ENABLED"])
 
     if env["vulkan"]:
-        env.Append(CPPDEFINES=["VULKAN_ENABLED"])
+        env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
 
     if env["opengl3"]:
         env.Append(CPPDEFINES=["GLES3_ENABLED", "GLES_SILENCE_DEPRECATION"])

diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
@@ -434,7 +434,7 @@ def configure(env: "Environment"):
         env.Append(CPPDEFINES=["X11_ENABLED"])
 
     if env["vulkan"]:
-        env.Append(CPPDEFINES=["VULKAN_ENABLED"])
+        env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
         if not env["use_volk"]:
             env.ParseConfig("pkg-config vulkan --cflags --libs")
         if not env["builtin_glslang"]:

diff --git a/platform/macos/detect.py b/platform/macos/detect.py
@@ -260,7 +260,7 @@ def configure(env: "Environment"):
     env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"])
 
     if env["vulkan"]:
-        env.Append(CPPDEFINES=["VULKAN_ENABLED"])
+        env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
         env.Append(LINKFLAGS=["-framework", "Metal", "-framework", "IOSurface"])
         if not env["use_volk"]:
             env.Append(LINKFLAGS=["-lMoltenVK"])

diff --git a/platform/windows/detect.py b/platform/windows/detect.py
@@ -436,7 +436,7 @@ def configure_msvc(env, vcvars_msvc_config):
         LIBS += ["psapi", "dbghelp"]
 
     if env["vulkan"]:
-        env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED"])
+        env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
         if not env["use_volk"]:
             LIBS += ["vulkan"]
 
@@ -445,7 +445,7 @@ def configure_msvc(env, vcvars_msvc_config):
             print("The Direct3D 12 rendering driver requires dxc_path to be set.")
             sys.exit(255)
 
-        env.AppendUnique(CPPDEFINES=["D3D12_ENABLED"])
+        env.AppendUnique(CPPDEFINES=["D3D12_ENABLED", "RD_ENABLED"])
         LIBS += ["d3d12", "dxgi", "dxguid"]
         LIBS += ["version"]  # Mesa dependency.
 
@@ -657,12 +657,12 @@ def configure_mingw(env):
         env.Append(LIBS=["psapi", "dbghelp"])
 
     if env["vulkan"]:
-        env.Append(CPPDEFINES=["VULKAN_ENABLED"])
+        env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
         if not env["use_volk"]:
             env.Append(LIBS=["vulkan"])
 
     if env["d3d12"]:
-        env.AppendUnique(CPPDEFINES=["D3D12_ENABLED"])
+        env.AppendUnique(CPPDEFINES=["D3D12_ENABLED", "RD_ENABLED"])
         env.Append(LIBS=["d3d12", "dxgi", "dxguid"])
 
         arch_subdir = "arm64" if env["arch"] == "arm64" else "x64"