godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add RD_ENABLED when VULKAN_ENABLED or D3D12_ENABLED is added

This commit is contained in:
jsjtxietian 2023-12-22 20:49:29 +08:00
parent 9d1cbab1c4
commit 078bfae6a4
7 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/d3d12/SCsub
View File

@ -5,8 +5,6 @@ from pathlib import Path
Import("env") Import("env")
env.Append(CPPDEFINES=["RD_ENABLED"])
env_d3d12_rdd = env.Clone() env_d3d12_rdd = env.Clone()
thirdparty_obj = [] thirdparty_obj = []

2
drivers/vulkan/SCsub
View File

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

2
platform/android/detect.py
View File

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

2
platform/ios/detect.py
View File

@ -152,7 +152,7 @@ def configure(env: "Environment"):
env.Append(CPPDEFINES=["IOS_ENABLED", "UNIX_ENABLED", "COREAUDIO_ENABLED"]) env.Append(CPPDEFINES=["IOS_ENABLED", "UNIX_ENABLED", "COREAUDIO_ENABLED"])
if env["vulkan"]: if env["vulkan"]:
env.Append(CPPDEFINES=["VULKAN_ENABLED"]) env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
if env["opengl3"]: if env["opengl3"]:
env.Append(CPPDEFINES=["GLES3_ENABLED", "GLES_SILENCE_DEPRECATION"]) env.Append(CPPDEFINES=["GLES3_ENABLED", "GLES_SILENCE_DEPRECATION"])

2
platform/linuxbsd/detect.py
View File

@ -434,7 +434,7 @@ def configure(env: "Environment"):
env.Append(CPPDEFINES=["X11_ENABLED"]) env.Append(CPPDEFINES=["X11_ENABLED"])
if env["vulkan"]: if env["vulkan"]:
env.Append(CPPDEFINES=["VULKAN_ENABLED"]) env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
if not env["use_volk"]: if not env["use_volk"]:
env.ParseConfig("pkg-config vulkan --cflags --libs") env.ParseConfig("pkg-config vulkan --cflags --libs")
if not env["builtin_glslang"]: if not env["builtin_glslang"]:

2
platform/macos/detect.py
View File

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

8
platform/windows/detect.py
View File

@ -436,7 +436,7 @@ def configure_msvc(env, vcvars_msvc_config):
LIBS += ["psapi", "dbghelp"] LIBS += ["psapi", "dbghelp"]
if env["vulkan"]: if env["vulkan"]:
env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED"]) env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
if not env["use_volk"]: if not env["use_volk"]:
LIBS += ["vulkan"] 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.") print("The Direct3D 12 rendering driver requires dxc_path to be set.")
sys.exit(255) sys.exit(255)
env.AppendUnique(CPPDEFINES=["D3D12_ENABLED"]) env.AppendUnique(CPPDEFINES=["D3D12_ENABLED", "RD_ENABLED"])
LIBS += ["d3d12", "dxgi", "dxguid"] LIBS += ["d3d12", "dxgi", "dxguid"]
LIBS += ["version"] # Mesa dependency. LIBS += ["version"] # Mesa dependency.
@ -657,12 +657,12 @@ def configure_mingw(env):
env.Append(LIBS=["psapi", "dbghelp"]) env.Append(LIBS=["psapi", "dbghelp"])
if env["vulkan"]: if env["vulkan"]:
env.Append(CPPDEFINES=["VULKAN_ENABLED"]) env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
if not env["use_volk"]: if not env["use_volk"]:
env.Append(LIBS=["vulkan"]) env.Append(LIBS=["vulkan"])
if env["d3d12"]: if env["d3d12"]:
env.AppendUnique(CPPDEFINES=["D3D12_ENABLED"]) env.AppendUnique(CPPDEFINES=["D3D12_ENABLED", "RD_ENABLED"])
env.Append(LIBS=["d3d12", "dxgi", "dxguid"]) env.Append(LIBS=["d3d12", "dxgi", "dxguid"])
arch_subdir = "arm64" if env["arch"] == "arm64" else "x64" arch_subdir = "arm64" if env["arch"] == "arm64" else "x64"