Skip to content

Commit fafb0ae

Browse files
authored
change filter comparison type for samplers, update test name (#4473)
* change filter comparison type for samplers, update test name * change filter/comparison type MIN_MAG_MIP_POINT
1 parent 9cd1f68 commit fafb0ae

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

tools/clang/test/HLSL/ShaderOpArith.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3579,10 +3579,10 @@ void MSMain(uint GID : SV_GroupIndex,
35793579
</DescriptorHeap>
35803580

35813581
<DescriptorHeap Name="SamplerDescriptorHeap" Type="SAMPLER">
3582-
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="30.0" />
3583-
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="31.0" />
3584-
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="32.0" ComparisonFunc="EQUAL"/>
3585-
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="33.0" ComparisonFunc="EQUAL"/>
3582+
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="30.0" Filter="MIN_MAG_MIP_POINT"/>
3583+
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="31.0" Filter="MIN_MAG_MIP_POINT" />
3584+
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="32.0" ComparisonFunc="EQUAL" Filter="COMPARISON_MIN_MAG_MIP_POINT"/>
3585+
<Descriptor Kind="SAMPLER" AddressU="BORDER" AddressV="BORDER" BorderColorR="33.0" ComparisonFunc="EQUAL" Filter="COMPARISON_MIN_MAG_MIP_POINT"/>
35863586
</DescriptorHeap>
35873587

35883588
<DescriptorHeap Name="RtvHeap" NumDescriptors="1" Type="RTV">

tools/clang/unittests/HLSL/ExecutionTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9878,7 +9878,7 @@ TEST_F(ExecutionTest, DynamicResourcesDynamicIndexingTest) {
98789878
unsigned num_models_to_test = ExecutionTest::IsFallbackPathEnabled() ? 2 : 1;
98799879
for (unsigned i = 0; i < num_models_to_test; i++) {
98809880
D3D_SHADER_MODEL sm = TestShaderModels[i];
9881-
LogCommentFmt(L"\r\nVerifying Dynamic Resources Uniform Indexing in shader "
9881+
LogCommentFmt(L"\r\nVerifying Dynamic Resources Dynamic Indexing in shader "
98829882
L"model 6.%1u",
98839883
((UINT)sm & 0x0f));
98849884

0 commit comments

Comments
 (0)