Skip to content

Prevent experimental RDAT on released shader models #8524

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

Draft
tex3d wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Prevent experimental RDAT on released shader models #8524

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
284994c
Predicate prerelease RDAT tables on prerelease shader model
tex3d Apr 8, 2026
c9dd137
Use 6.10 for tests using experimental RDAT tables
tex3d May 27, 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
17 changes: 15 additions & 2 deletions lib/DxilContainer/DxilContainerAssembler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,12 @@ class DxilRDATWriter : public DxilPartWriter {

unsigned m_ValMajor, m_ValMinor;

// Prerelease data is guarded behind this flag. Only supported when targeting
// a prerelease shader model. When transitioning data to release, look for
// uses of this flag to update code to check the validator version for the new
// release version instead.
bool m_AllowPrereleaseData = false;

void
FindUsingFunctions(const llvm::Value *User,
llvm::SmallVectorImpl<const llvm::Function *> &functions) {
Expand Down Expand Up @@ -1547,8 +1553,7 @@ class DxilRDATWriter : public DxilPartWriter {
if (entryProps.props.IsNode()) {
shaderInfo = AddShaderNodeInfo(DM, function, entryProps, *pInfo2,
TGSMInFunc[&function]);
} else if (DXIL::CompareVersions(m_ValMajor, m_ValMinor, 1, 8) >
0) {
} else if (m_AllowPrereleaseData) {
shaderInfo =
AddShaderInfo(function, entryProps, *pInfo2,
compatInfo.shaderFlags, TGSMInFunc[&function]);
Expand Down Expand Up @@ -1659,6 +1664,14 @@ class DxilRDATWriter : public DxilPartWriter {
RDAT::RuntimeDataPartType maxAllowedType =
RDAT::MaxPartTypeForValVer(m_ValMajor, m_ValMinor);

// Only write prerelease tables if the shader model is prerelease, to avoid
// writing prerelease data into release shader models, which might not be
// comatible with newer runtimes.
m_AllowPrereleaseData = mod.GetShaderModel()->IsPreReleaseShaderModel();
if (!m_AllowPrereleaseData)
maxAllowedType =
std::min(maxAllowedType, RDAT::RuntimeDataPartType::LastRelease);

mod.ComputeShaderCompatInfo();

// Instantiate the parts in the order that validator expects.
Expand Down
4 changes: 2 additions & 2 deletions tools/clang/test/HLSLFileCheck/d3dreflect/amp-groupshared.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %dxc -T lib_6_7 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s
// RUN: %dxc -T lib_6_10 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s


// CHECK:DxilRuntimeData (size = {{[0-9]+}} bytes):
Expand Down Expand Up @@ -64,7 +64,7 @@
// CHECK: FunctionCount: 1
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: amplification
// CHECK: Shader Version: Amplification 6.7
// CHECK: Shader Version: Amplification 6.10
// CHECK: Flags: 0
// CHECK: ConstantBuffers: 0
// CHECK: BoundResources: 1
Expand Down
4 changes: 2 additions & 2 deletions tools/clang/test/HLSLFileCheck/d3dreflect/comp-groupshared.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %dxc -T lib_6_5 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s
// RUN: %dxc -T lib_6_10 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s

// CHECK:DxilRuntimeData (size = {{[0-9]+}} bytes):
// CHECK: StringBuffer (size = {{[0-9]+}} bytes)
Expand Down Expand Up @@ -82,7 +82,7 @@
// CHECK: FunctionCount: 1
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: main
// CHECK: Shader Version: Compute 6.5
// CHECK: Shader Version: Compute 6.10
// CHECK: Creator: <nullptr>
// CHECK: Flags: 0
// CHECK: ConstantBuffers: 1
Expand Down
8 changes: 4 additions & 4 deletions tools/clang/test/HLSLFileCheck/d3dreflect/lib_exports1.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %dxc -auto-binding-space 13 -exports VS_RENAMED=\01?VSMain@@YA?AV?$vector@M$03@@V?$vector@H$02@@@Z;PS_RENAMED=PSMain -T lib_6_3 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s
// RUN: %dxc -auto-binding-space 13 -exports VS_RENAMED=\01?VSMain@@YA?AV?$vector@M$03@@V?$vector@H$02@@@Z;PS_RENAMED=PSMain -T lib_6_10 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s

Buffer<float> T_unused;

Expand Down Expand Up @@ -154,7 +154,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: FunctionCount: 3
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?PS_RENAMED{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand All @@ -179,7 +179,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?VS_RENAMED{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 1
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T1
Expand All @@ -194,7 +194,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: uFlags: (D3D_SIF_TEXTURE_COMPONENT_0 | D3D_SIF_TEXTURE_COMPONENT_1)
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: PS_RENAMED
// CHECK: Shader Version: Pixel 6.3
// CHECK: Shader Version: Pixel 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand Down
10 changes: 5 additions & 5 deletions tools/clang/test/HLSLFileCheck/d3dreflect/lib_exports2.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %dxc -auto-binding-space 13 -exports VSMain;VS_RENAMED=\01?VSMain@@YA?AV?$vector@M$03@@V?$vector@H$02@@@Z;RayGen1,RayGen2=RayGen -T lib_6_3 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s
// RUN: %dxc -auto-binding-space 13 -exports VSMain;VS_RENAMED=\01?VSMain@@YA?AV?$vector@M$03@@V?$vector@H$02@@@Z;RayGen1,RayGen2=RayGen -T lib_6_10 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s

Buffer<int> T0;

Expand Down Expand Up @@ -166,7 +166,7 @@ void RayGen() {
// CHECK: FunctionCount: 4
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?RayGen1{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: RayGeneration 6.3
// CHECK: Shader Version: RayGeneration 6.10
// CHECK: BoundResources: 1
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: U0
Expand All @@ -181,7 +181,7 @@ void RayGen() {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?RayGen2{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: RayGeneration 6.3
// CHECK: Shader Version: RayGeneration 6.10
// CHECK: BoundResources: 1
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: U0
Expand All @@ -196,7 +196,7 @@ void RayGen() {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?VS_RENAMED{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 1
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T1
Expand All @@ -211,7 +211,7 @@ void RayGen() {
// CHECK: uFlags: (D3D_SIF_TEXTURE_COMPONENT_0 | D3D_SIF_TEXTURE_COMPONENT_1)
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: VSMain
// CHECK: Shader Version: Vertex 6.3
// CHECK: Shader Version: Vertex 6.10
// CHECK: BoundResources: 1
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T1
Expand Down
14 changes: 7 additions & 7 deletions tools/clang/test/HLSLFileCheck/d3dreflect/lib_exports3.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %dxc -auto-binding-space 13 -exports PSMain,PSMain_Clone1,PSMain_Clone2=PSMain -T lib_6_3 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s
// RUN: %dxc -auto-binding-space 13 -exports PSMain,PSMain_Clone1,PSMain_Clone2=PSMain -T lib_6_10 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s

Buffer<int> T0;

Expand Down Expand Up @@ -207,7 +207,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: FunctionCount: 6
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?PSMain{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand All @@ -232,7 +232,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?PSMain_Clone1{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand All @@ -257,7 +257,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?PSMain_Clone2{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand All @@ -282,7 +282,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: PSMain
// CHECK: Shader Version: Pixel 6.3
// CHECK: Shader Version: Pixel 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand All @@ -307,7 +307,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: PSMain_Clone1
// CHECK: Shader Version: Pixel 6.3
// CHECK: Shader Version: Pixel 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand All @@ -332,7 +332,7 @@ float4 PSMain(int idx : INDEX) : SV_Target {
// CHECK: uFlags: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: PSMain_Clone2
// CHECK: Shader Version: Pixel 6.3
// CHECK: Shader Version: Pixel 6.10
// CHECK: BoundResources: 2
// CHECK: Bound Resources:
// CHECK: D3D12_SHADER_INPUT_BIND_DESC: Name: T0
Expand Down
12 changes: 6 additions & 6 deletions tools/clang/test/HLSLFileCheck/d3dreflect/lib_hs_export2.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %dxc -auto-binding-space 13 -T lib_6_3 -exports HSMain1;HSMain3 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s
// RUN: %dxc -auto-binding-space 13 -T lib_6_10 -exports HSMain1;HSMain3 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s

Buffer<float> T_unused;

Expand Down Expand Up @@ -278,24 +278,24 @@ HSPerPatchData HSPerPatchFunc1()
// CHECK: FunctionCount: 5
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?HSMain1{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 0
// CHECK: ID3D12FunctionReflection:
// CHECK-NOT: D3D12_FUNCTION_DESC: Name: \01?HSMain2{{[@$?.A-Za-z0-9_]+}}
// CHECK: D3D12_FUNCTION_DESC: Name: \01?HSMain3{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 0
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: \01?HSPerPatchFunc1{{[@$?.A-Za-z0-9_]+}}
// CHECK: Shader Version: Library 6.3
// CHECK: Shader Version: Library 6.10
// CHECK: BoundResources: 0
// CHECK: ID3D12FunctionReflection:
// CHECK-NOT: D3D12_FUNCTION_DESC: Name: \01?HSPerPatchFunc2{{[@$?.A-Za-z0-9_]+}}
// CHECK: D3D12_FUNCTION_DESC: Name: HSMain1
// CHECK: Shader Version: Hull 6.3
// CHECK: Shader Version: Hull 6.10
// CHECK: BoundResources: 0
// CHECK: ID3D12FunctionReflection:
// CHECK-NOT: D3D12_FUNCTION_DESC: Name: HSMain2
// CHECK: D3D12_FUNCTION_DESC: Name: HSMain3
// CHECK: Shader Version: Hull 6.3
// CHECK: Shader Version: Hull 6.10
// CHECK: BoundResources: 0
4 changes: 2 additions & 2 deletions tools/clang/test/HLSLFileCheck/d3dreflect/mesh-groupshared.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %dxc -T lib_6_7 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s
// RUN: %dxc -T lib_6_10 -Vd -validator-version 0.0 %s | %D3DReflect %s | FileCheck %s

// CHECK:DxilRuntimeData (size = {{[0-9]+}} bytes):
// CHECK: StringBuffer (size = {{[0-9]+}} bytes)
Expand Down Expand Up @@ -153,7 +153,7 @@
// CHECK: FunctionCount: 1
// CHECK: ID3D12FunctionReflection:
// CHECK: D3D12_FUNCTION_DESC: Name: main
// CHECK: Shader Version: Mesh 6.7
// CHECK: Shader Version: Mesh 6.10
// CHECK: Creator: <nullptr>
// CHECK: Flags: 0
// CHECK: ConstantBuffers: 0
Expand Down
Loading