Skip to content

[HLSL] Fix GroupSharedLimit preview guard #8872

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
Jack Elliott (JoeCitizen) merged 1 commit into from
Sep 2, 2026
+9 −9
Merged

[HLSL] Fix GroupSharedLimit preview guard #8872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions tools/clang/unittests/HLSLExec/ExecutionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ class ExecutionTest {
TEST_METHOD(WaveSizeRangeTest);
// TODO(#8661): Remove me when GroupSharedLimit is available in a released
// Windows SDK.
#if defined(D3D12_PREVIEW_SDK_VERSION)
#if defined(DIRECT3D_PREVIEW_BUILD)
TEST_METHOD(GroupSharedLimitTest);
TEST_METHOD(GroupSharedLimitASTest);
TEST_METHOD(GroupSharedLimitMSTest);
#endif // defined(D3D12_PREVIEW_SDK_VERSION)
#endif // defined(DIRECT3D_PREVIEW_BUILD)
TEST_METHOD(GroupWaveIndexTest);
TEST_METHOD(PartialDerivTest);
TEST_METHOD(DerivativesTest);
Expand Down Expand Up @@ -10630,7 +10630,7 @@ void ExecutionTest::WaveSizeRangeTest() {

// TODO(#8661): Remove me when GroupSharedLimit is available in a released
// Windows SDK.
#if defined(D3D12_PREVIEW_SDK_VERSION)
#if defined(DIRECT3D_PREVIEW_BUILD)
// Helper: create a SM 6.10 device with HLK-aware skip/fail logic.
// Returns true if device was created, false if skipped.
static bool CreateGSMLimitTestDevice(D3D12SDKSelector *D3D12SDK,
Expand Down Expand Up @@ -10941,7 +10941,7 @@ void ExecutionTest::GroupSharedLimitMSTest() {
L"MS Test passed: GroupSharedLimit in mesh shader succeeded.");
}
}
#endif // defined(D3D12_PREVIEW_SDK_VERSION)
#endif // defined(DIRECT3D_PREVIEW_BUILD)

void ExecutionTest::GroupWaveIndexTest() {
WEX::TestExecution::SetVerifyOutput VerifySettings(
Expand Down
6 changes: 3 additions & 3 deletions tools/clang/unittests/HLSLExec/HlslExecTestUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// group shared memory capabilities from the Agility SDK runtime.
// TODO(#8661): Remove me when GroupSharedLimit is available in a released
// Windows SDK.
#if defined(D3D12_PREVIEW_SDK_VERSION) && D3D12_PREVIEW_SDK_VERSION < 720
#if defined(DIRECT3D_PREVIEW_BUILD) && D3D12_PREVIEW_SDK_VERSION < 720

#ifndef D3D12_FEATURE_D3D12_OPTIONS_PREVIEW
#define D3D12_FEATURE_D3D12_OPTIONS_PREVIEW ((D3D12_FEATURE)72)
Expand Down Expand Up @@ -1470,7 +1470,7 @@ HRESULT queryAtomicAccumulateStore(ID3D12Device *Device,

// TODO(#8661): Remove me when GroupSharedLimit is available in a released
// Windows SDK.
#if defined(D3D12_PREVIEW_SDK_VERSION)
#if defined(DIRECT3D_PREVIEW_BUILD)
UINT getMaxGroupSharedMemoryCS(ID3D12Device *Device) {
D3D12_FEATURE_DATA_D3D12_OPTIONS_PREVIEW O = {};
VERIFY_SUCCEEDED(Device->CheckFeatureSupport(
Expand All @@ -1491,7 +1491,7 @@ UINT getMaxGroupSharedMemoryMS(ID3D12Device *Device) {
D3D12_FEATURE_D3D12_OPTIONS_PREVIEW, &O, sizeof(O)));
return O.MaxGroupSharedMemoryPerGroupMS;
}
#endif // defined(D3D12_PREVIEW_SDK_VERSION)
#endif // defined(DIRECT3D_PREVIEW_BUILD)

std::unique_ptr<st::ShaderOp> createComputeOp(const char *Source,
const char *Target,
Expand Down
4 changes: 2 additions & 2 deletions tools/clang/unittests/HLSLExec/HlslExecTestUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,11 @@ HRESULT queryAtomicAccumulateStore(ID3D12Device *Device,

// TODO(#8661): Remove me when GroupSharedLimit is available in a released
// Windows SDK.
#if defined(D3D12_PREVIEW_SDK_VERSION)
#if defined(DIRECT3D_PREVIEW_BUILD)
UINT getMaxGroupSharedMemoryCS(ID3D12Device *Device);
UINT getMaxGroupSharedMemoryAS(ID3D12Device *Device);
UINT getMaxGroupSharedMemoryMS(ID3D12Device *Device);
#endif // defined(D3D12_PREVIEW_SDK_VERSION)
#endif // defined(DIRECT3D_PREVIEW_BUILD)

/// Create a ShaderOp for a compute shader dispatch.
std::unique_ptr<st::ShaderOp>
Expand Down
Loading