Clean up includes in drivers/d3d12#117359
Open
akien-mga wants to merge 1 commit intogodotengine:masterfrom
Open
Clean up includes in drivers/d3d12#117359akien-mga wants to merge 1 commit intogodotengine:masterfrom
drivers/d3d12#117359akien-mga wants to merge 1 commit intogodotengine:masterfrom
Conversation
akien-mga
requested review from
blueskythlikesclouds and
bruvzg
and removed request for
a team
akien-mga
commented
Mar 12, 2026
Comment on lines
+36
to
+38
| //GODOT_MSVC_WARNING_PUSH | ||
| //GODOT_MSVC_WARNING_IGNORE(4200) // "nonstandard extension used: zero-sized array in struct/union". | ||
| //GODOT_MSVC_WARNING_IGNORE(4806) // "'&': unsafe operation: no value of type 'bool' promoted to type 'uint32_t' can equal the given constant". |
Member
Author
There was a problem hiding this comment.
I haven't tested whether those can be safely removed for MSVC, we'll see what CI says.
Member
Author
There was a problem hiding this comment.
Seems like only C4200 was still relevant, and specifically for nir.h, so I moved it to godot_nir.h.
akien-mga
force-pushed
the
d3d12-cleanup-includes
branch
from
d2ca348 to
c356f33
Compare
akien-mga
force-pushed
the
d3d12-cleanup-includes
branch
from
c356f33 to
7d40e98
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
platformanddriverswith clangd-tidy #117328.While working on the above PR I took the chance to refactor the
drivers/d3d12code a bit to wrap some thirdparty headers that require specific pragmas or definitions, which addsgodot_d3dx12.h,godot_d3d12ma.h, andgodot_nir.h. These new wrapper headers should be included with angled brackets to be properly treated as "system"/thirdparty, which avoids some diagnostics to show up with clangd.I also cleaned up the pragmas to reduce them to what seems to be the minimal changes to compile (possibly some of these warnings were solved in D3D12/Mesa). Needs testing, especially with MSVC as I only tested mingw-gcc and llvm-mingw from Linux.
I removed the
AStypedef for AudioServer as we don't use it and it caused a-Wshadowwarning in one of the thirdparty D3D12 headers.