Skip to content

D3D12: Revert to CPPPATH for Mesa private headers #106413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

D3D12: Revert to CPPPATH for Mesa private headers #106413

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b4e9fb
D3D12: Revert to CPPPATH for Mesa private headers
akien-mga May 14, 2025
fd3f20c
Shot in the dark
akien-mga May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions drivers/d3d12/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Import("env")

env_d3d12_rdd = env.Clone()

thirdparty_obj = []


# DirectX Headers (must take precedence over Windows SDK's).

Expand Down Expand Up @@ -112,6 +110,10 @@ mesa_blacklist_inc_paths = [
mesa_blacklist_inc_paths = [mesa_dir + "/" + v for v in mesa_blacklist_inc_paths]
mesa_private_inc_paths = [v for v in mesa_private_inc_paths if v not in mesa_blacklist_inc_paths]

# This is needed since rendering_device_d3d12.cpp needs to include some Mesa internals.
# Appending instead of prepending to ensure we keep Windows SDKs included first (GH-106376).
env_d3d12_rdd.Append(CPPEXTPATH=mesa_private_inc_paths)

# Added by ourselves.
extra_defines = [
"WINDOWS_NO_FUTEX",
Expand Down Expand Up @@ -154,22 +156,12 @@ else:
env_d3d12_rdd.Append(CCFLAGS=["-Wno-unknown-pragmas"])
env.Append(CCFLAGS=["-Wno-unknown-pragmas"])

# This is needed since rendering_device_d3d12.cpp needs to include some Mesa internals.
env_d3d12_rdd.Prepend(CPPEXTPATH=mesa_private_inc_paths)
# For the same reason as above, the defines must be the same as in the 3rd-party code itself.
env_d3d12_rdd.Append(CPPDEFINES=extra_defines)


# Add all.

env.drivers_sources += thirdparty_obj


# Godot source files.

driver_obj = []
env_d3d12_rdd.add_source_files(driver_obj, "*.cpp")
env.drivers_sources += driver_obj

# Needed to force rebuilding the driver files when the thirdparty code is updated.
env.Depends(driver_obj, thirdparty_obj)