Skip to content

[SM6.10] Add missing linalg.h include guard #9070

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

Merged
Ashley Coleman (V-FEXrt) merged 2 commits into from
Oct 23, 2026
Merged

[SM6.10] Add missing linalg.h include guard #9070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd67e97
[SM6.10] Add missing linalg.h include guard
V-FEXrt Oct 22, 2026
6d53492
Add general double include tests
V-FEXrt Oct 23, 2026
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
5 changes: 5 additions & 0 deletions tools/clang/lib/Headers/hlsl/dx/linalg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
// DirectX Shader Model 6.10 Linear Algebra objects and APIs.
//===----------------------------------------------------------------------===//

#ifndef _HLSL_DX_LINALG_H_
#define _HLSL_DX_LINALG_H_
Comment on lines +12 to +13

#include <enable_if>
#include <type_traits>

Expand Down Expand Up @@ -720,3 +723,5 @@ InterlockedAccumulate(RWByteAddressBuffer Res, uint StartOffset,
#pragma dxc diagnostic pop

#endif // SM 6.10 check and HV version check

#endif // _HLSL_DX_LINALG_H_
31 changes: 31 additions & 0 deletions tools/clang/test/SemaHLSL/hlsl/embedded_headers/include_guards.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// REQUIRES: dxil-1-10

// RUN: %dxc -T cs_6_10 -E main -HV 2021 -enable-16bit-types -verify %s
// RUN: %dxc -DTEST_DXIL -T cs_6_10 -E main -HV 2021 -enable-16bit-types -verify %s
// RUN: %dxc %if spirv %{ -spirv -fspv-target-env=vulkan1.3 %} -T cs_6_2 -E main -HV 2021 -enable-16bit-types -verify %s

// expected-no-diagnostics

#include <enable_if>
#include <enable_if>
#include <type_traits>
#include <type_traits>
#include <vector_utils>
#include <vector_utils>

#ifdef __spirv__
#include <vk/spirv.h>
#include <vk/spirv.h>
#include <vk/opcode_selector.h>
#include <vk/opcode_selector.h>
// The public header also covers cooperative_matrix.impl.
#include <vk/khr/cooperative_matrix.h>
#include <vk/khr/cooperative_matrix.h>
#endif

#ifdef TEST_DXIL
#include <dx/linalg.h>
#include <dx/linalg.h>
#endif

[numthreads(1, 1, 1)] void main() {}
Loading