6f0253b435
This pr fixes some inconsistencies in behaviour of how we handle `StaticSamplersOffset` with respect to DXC and `RootParameterOffset`. Namely: 1. Make codegen of `RTS0` always compute the `StaticSamplersOffset` regardless if there are any `StaticSampler`s. This is to be consistent and produce an identical `DXContainer` as DXC. 2. Make the `StaticSamplersOffset` and `RootParametersOffset` optional parameters in the yaml description. This means it will be used when it is specified (which was not necassarily the case before). 3. Enforce that the provided `StaticSamplersOffset` and `RootParametersOffset` in a yaml description match the computed value. For more context see: https://github.com/llvm/llvm-project/issues/155299. Description of existing test updates updates: - `CodeGen/DirectX/ContainerData`: Updated to codegen computed values (previously unspecified) - `llvm-objcopy/DXContainer`: Updated to `yaml2obj` computed values (previously unspecified) - `ObjectYAML/DXContainer`: Updated to `yaml2obj` computed values (previously incorrect) - `ObjectYAML/DXContainerYAMLTest`: Updated to `yaml2obj` computed values (previously incorrect) See newly added tests for testing of optional parameter functionality and `StaticSamplersOffset` computation. Resolves: https://github.com/llvm/llvm-project/issues/155299
64 lines
1.9 KiB
YAML
64 lines
1.9 KiB
YAML
# RUN: yaml2obj %s | obj2yaml | FileCheck %s
|
|
|
|
--- !dxcontainer
|
|
Header:
|
|
Hash: [ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
|
|
0x0, 0x0, 0x0, 0x0, 0x0, 0x0 ]
|
|
Version:
|
|
Major: 1
|
|
Minor: 0
|
|
PartCount: 1
|
|
PartOffsets: [ 60 ]
|
|
Parts:
|
|
- Name: RTS0
|
|
Size: 76
|
|
RootSignature:
|
|
Version: 2
|
|
NumRootParameters: 0
|
|
RootParametersOffset: 24
|
|
NumStaticSamplers: 1
|
|
StaticSamplersOffset: 24
|
|
Parameters: []
|
|
Samplers:
|
|
- Filter: 10
|
|
AddressU: 1
|
|
AddressV: 2
|
|
AddressW: 5
|
|
MipLODBias: 1.23
|
|
MaxAnisotropy: 20
|
|
ComparisonFunc: 4
|
|
BorderColor: 0
|
|
MinLOD: 4.56
|
|
MaxLOD: 8.90
|
|
ShaderRegister: 31
|
|
RegisterSpace: 32
|
|
ShaderVisibility: 7
|
|
AllowInputAssemblerInputLayout: true
|
|
DenyGeometryShaderRootAccess: true
|
|
|
|
#CHECK: - Name: RTS0
|
|
#CHECK-NEXT: Size: 76
|
|
#CHECK-NEXT: RootSignature:
|
|
#CHECK-NEXT: Version: 2
|
|
#CHECK-NEXT: NumRootParameters: 0
|
|
#CHECK-NEXT: RootParametersOffset: 24
|
|
#CHECK-NEXT: NumStaticSamplers: 1
|
|
#CHECK-NEXT: StaticSamplersOffset: 24
|
|
#CHECK-NEXT: Parameters: []
|
|
#CHECK-NEXT: Samplers:
|
|
#CHECK-NEXT: - Filter: 10
|
|
#CHECK-NEXT: AddressU: 1
|
|
#CHECK-NEXT: AddressV: 2
|
|
#CHECK-NEXT: AddressW: 5
|
|
#CHECK-NEXT: MipLODBias: 1.23
|
|
#CHECK-NEXT: MaxAnisotropy: 20
|
|
#CHECK-NEXT: ComparisonFunc: 4
|
|
#CHECK-NEXT: BorderColor: 0
|
|
#CHECK-NEXT: MinLOD: 4.56
|
|
#CHECK-NEXT: MaxLOD: 8.9
|
|
#CHECK-NEXT: ShaderRegister: 31
|
|
#CHECK-NEXT: RegisterSpace: 32
|
|
#CHECK-NEXT: ShaderVisibility: 7
|
|
#CHECK-NEXT: AllowInputAssemblerInputLayout: true
|
|
#CHECK-NEXT: DenyGeometryShaderRootAccess: true
|