godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Add RD_ENABLED when VULKAN_ENABLED or D3D12_ENABLED is added

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/windows/detect.py
View File

@@ -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"