Skip to content

Commit 0e80c63

Browse files
committed
addressing comments from bogner
1 parent c374634 commit 0e80c63

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9489,7 +9489,7 @@ def fdx_rootsignature_version :
94899489
Values<"rootsig_1_0,rootsig_1_1,rootsig_1_2">,
94909490
NormalizedValuesScope<"llvm::dxbc::RootSignatureVersion">,
94919491
NormalizedValues<["V1_0", "V1_1", "V1_2"]>,
9492-
MarshallingInfoEnum<LangOpts<"HLSLRootSigVer">, "V1_2">;
9492+
MarshallingInfoEnum<LangOpts<"HLSLRootSigVer">, "V1_1">;
94939493
def dxc_rootsig_ver :
94949494
Separate<["/", "-"], "force-rootsig-ver">,
94959495
Alias<fdx_rootsignature_version>,

clang/test/AST/HLSL/RootSignature-Target-AST.hlsl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-rootsignature -ast-dump \
2-
// RUN: -fdx-rootsignature-version=rootsig_1_1 \
3-
// RUN: -hlsl-entry EntryRootSig -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-V1_1
4-
51
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-rootsignature -ast-dump \
62
// RUN: -fdx-rootsignature-version=rootsig_1_0 \
73
// RUN: -hlsl-entry EntryRootSig -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-V1_0
84

5+
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-rootsignature -ast-dump \
6+
// RUN: -fdx-rootsignature-version=rootsig_1_1 \
7+
// RUN: -hlsl-entry EntryRootSig -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-V1_1
8+
99
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-rootsignature -ast-dump \
1010
// RUN: -fdx-rootsignature-version=rootsig_1_2 \
1111
// RUN: -hlsl-entry EntryRootSig -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-V1_2

clang/test/Driver/dxc_frs.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Test to demonstrate extracting the root signature to the specified
44
// output file with /Frs.
55

6-
// CHECK: "{{.*}}/llvm-objcopy{{(.exe)?}}" "{{.*}}.obj" "{{.*}}.{{(dxo|obj)}}" "--extract-section=RTS0={{.*}}.rs.dxo"
6+
// CHECK: "{{.*}}llvm-objcopy{{(.exe)?}}" "{{.*}}.obj" "{{.*}}.dxo" "--extract-section=RTS0={{.*}}.rs.dxo"
77

88
[shader("compute"), RootSignature("")]
99
[numthreads(1,1,1)]

clang/test/Driver/dxc_rootsignature_target.hlsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
// CMDS: "{{.*}}clang{{.*}}" "-cc1"
44
// CMDS-SAME: "-triple" "dxilv1.1-unknown-shadermodel1.1-rootsignature"
55
// CMDS-SAME: "-hlsl-entry" "EntryRS"
6-
// CMDS: "{{.*}}llvm-objcopy{{(.exe)?}}" "{{.*}}.{{(dxo|obj)}}" "--only-section=RTS0"
6+
// CMDS: "{{.*}}llvm-objcopy{{(.exe)?}}" "{{.*}}.dxo" "--only-section=RTS0"
77

88
#define EntryRS "UAV(u0)"

0 commit comments

Comments
 (0)