Skip to content

[SM6.10][Bugfix][HLK] Only define SDK consts when missing #8341

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
V-FEXrt merged 2 commits into from
Apr 6, 2026
+10 −6
Merged

[SM6.10][Bugfix][HLK] Only define SDK consts when missing #8341

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
3e8b0d4
[SM6.10][Bugfix][HLK] Only define SM6.10 when not provided
V-FEXrt Apr 6, 2026
48ab549
Missed some defines
V-FEXrt Apr 6, 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
7 changes: 5 additions & 2 deletions tools/clang/unittests/HLSLExec/HlslExecTestUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
// D3D12_FEATURE_D3D12_OPTIONS_PREVIEW and its data struct are not yet in
// the released Windows SDK. Define locally so the test can query variable
// group shared memory capabilities from the Agility SDK runtime.
// Once the public SDK ships with these, a compile break (redefinition error)
// will signal that these local definitions should be removed.
// This should be removed once widely supported.
#if defined(D3D12_PREVIEW_SDK_VERSION) && D3D12_PREVIEW_SDK_VERSION < 720

#ifndef D3D12_FEATURE_D3D12_OPTIONS_PREVIEW
#define D3D12_FEATURE_D3D12_OPTIONS_PREVIEW ((D3D12_FEATURE)72)
#endif
Expand All @@ -27,6 +28,8 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS_PREVIEW {
UINT MaxGroupSharedMemoryPerGroupMS;
} D3D12_FEATURE_DATA_D3D12_OPTIONS_PREVIEW;

#endif

using namespace hlsl_test;

static bool useDebugIfaces() { return true; }
Expand Down
9 changes: 5 additions & 4 deletions tools/clang/unittests/HLSLExec/HlslExecTestUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
#include "ShaderOpTest.h"
#include "dxc/Support/dxcapi.use.h"

// D3D_SHADER_MODEL_6_10 is not yet in the released Windows SDK.
// Define locally so the tests can target SM 6.10.
// Once the public SDK ships with this, a compile break (redefinition error)
// will signal that this local definition should be removed.
// D3D_SHADER_MODEL_6_10 is not yet in the released Windows SDK. Define locally
// so the test can query 6.10 driver support. This should be removed once
// widely supported.
#if defined(D3D12_PREVIEW_SDK_VERSION) && D3D12_PREVIEW_SDK_VERSION < 720
static const D3D_SHADER_MODEL D3D_SHADER_MODEL_6_10 = (D3D_SHADER_MODEL)0x6a;
#endif

// Local highest shader model known to DXC. Update this when adding support
// for new shader models. Unlike D3D_HIGHEST_SHADER_MODEL from the SDK,
Expand Down
Loading