Skip to content

Commit 7899f3c

Browse files
wooyoungqcomjeremy-lunarg
wooyoungqcom
authored and
jeremy-lunarg
committed
Compile SPV_QCOM_image_processing/SPV_QCOM_image_processing2
tests under the SPV 1.4 semantics
1 parent f3a7f2c commit 7899f3c

10 files changed

+41
-27
lines changed

‎Test/baseResults/spv.tpipBlockMatchGatherSAD.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipBlockMatchGatherSAD.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 72
55

@@ -10,7 +10,7 @@ spv.tpipBlockMatchGatherSAD.frag
1010
Extension "SPV_QCOM_image_processing2"
1111
1: ExtInstImport "GLSL.std.450"
1212
MemoryModel Logical GLSL450
13-
EntryPoint Fragment 4 "main" 13 41
13+
EntryPoint Fragment 4 "main" 13 41 44 48 53 61 64 71
1414
ExecutionMode 4 OriginUpperLeft
1515
Source GLSL 450
1616
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipBlockMatchGatherSSD.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipBlockMatchGatherSSD.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 72
55

@@ -10,7 +10,7 @@ spv.tpipBlockMatchGatherSSD.frag
1010
Extension "SPV_QCOM_image_processing2"
1111
1: ExtInstImport "GLSL.std.450"
1212
MemoryModel Logical GLSL450
13-
EntryPoint Fragment 4 "main" 13 41
13+
EntryPoint Fragment 4 "main" 13 41 44 48 53 61 64 71
1414
ExecutionMode 4 OriginUpperLeft
1515
Source GLSL 450
1616
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipBlockMatchSAD.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipBlockMatchSAD.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 72
55

@@ -8,7 +8,7 @@ spv.tpipBlockMatchSAD.frag
88
Extension "SPV_QCOM_image_processing"
99
1: ExtInstImport "GLSL.std.450"
1010
MemoryModel Logical GLSL450
11-
EntryPoint Fragment 4 "main" 13 41
11+
EntryPoint Fragment 4 "main" 13 41 44 48 53 61 64 71
1212
ExecutionMode 4 OriginUpperLeft
1313
Source GLSL 450
1414
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipBlockMatchSSD.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipBlockMatchSSD.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 72
55

@@ -8,7 +8,7 @@ spv.tpipBlockMatchSSD.frag
88
Extension "SPV_QCOM_image_processing"
99
1: ExtInstImport "GLSL.std.450"
1010
MemoryModel Logical GLSL450
11-
EntryPoint Fragment 4 "main" 13 41
11+
EntryPoint Fragment 4 "main" 13 41 44 48 53 61 64 71
1212
ExecutionMode 4 OriginUpperLeft
1313
Source GLSL 450
1414
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipBlockMatchWindowSAD.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipBlockMatchWindowSAD.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 72
55

@@ -10,7 +10,7 @@ spv.tpipBlockMatchWindowSAD.frag
1010
Extension "SPV_QCOM_image_processing2"
1111
1: ExtInstImport "GLSL.std.450"
1212
MemoryModel Logical GLSL450
13-
EntryPoint Fragment 4 "main" 13 41
13+
EntryPoint Fragment 4 "main" 13 41 44 48 53 61 64 71
1414
ExecutionMode 4 OriginUpperLeft
1515
Source GLSL 450
1616
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipBlockMatchWindowSSD.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipBlockMatchWindowSSD.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 72
55

@@ -10,7 +10,7 @@ spv.tpipBlockMatchWindowSSD.frag
1010
Extension "SPV_QCOM_image_processing2"
1111
1: ExtInstImport "GLSL.std.450"
1212
MemoryModel Logical GLSL450
13-
EntryPoint Fragment 4 "main" 13 41
13+
EntryPoint Fragment 4 "main" 13 41 44 48 53 61 64 71
1414
ExecutionMode 4 OriginUpperLeft
1515
Source GLSL 450
1616
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipBoxFilter.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipBoxFilter.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 43
55

@@ -8,7 +8,7 @@ spv.tpipBoxFilter.frag
88
Extension "SPV_QCOM_image_processing"
99
1: ExtInstImport "GLSL.std.450"
1010
MemoryModel Logical GLSL450
11-
EntryPoint Fragment 4 "main" 15 27
11+
EntryPoint Fragment 4 "main" 15 18 22 27 33 41 42
1212
ExecutionMode 4 OriginUpperLeft
1313
Source GLSL 450
1414
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipSampleWeighted.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipSampleWeighted.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 43
55

@@ -8,7 +8,7 @@ spv.tpipSampleWeighted.frag
88
Extension "SPV_QCOM_image_processing"
99
1: ExtInstImport "GLSL.std.450"
1010
MemoryModel Logical GLSL450
11-
EntryPoint Fragment 4 "main" 9 21
11+
EntryPoint Fragment 4 "main" 9 12 16 21 27 34 39 42
1212
ExecutionMode 4 OriginUpperLeft
1313
Source GLSL 450
1414
SourceExtension "GL_QCOM_image_processing"

‎Test/baseResults/spv.tpipTextureArrays.frag.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
spv.tpipTextureArrays.frag
2-
// Module Version 10000
2+
// Module Version 10400
33
// Generated by (magic number): 8000b
44
// Id's are bound by 84
55

@@ -8,7 +8,7 @@ spv.tpipTextureArrays.frag
88
Extension "SPV_QCOM_image_processing"
99
1: ExtInstImport "GLSL.std.450"
1010
MemoryModel Logical GLSL450
11-
EntryPoint Fragment 4 "main" 13 46
11+
EntryPoint Fragment 4 "main" 13 46 51 60 67
1212
ExecutionMode 4 OriginUpperLeft
1313
Source GLSL 450
1414
SourceExtension "GL_QCOM_image_processing"

‎gtests/Spv.FromFile.cpp‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ using HlslIoMap = GlslangTest<::testing::TestWithParam<IoMapData>>;
7878
using GlslIoMap = GlslangTest<::testing::TestWithParam<IoMapData>>;
7979
using CompileVulkanToSpirvTestQCOM = GlslangTest<::testing::TestWithParam<std::string>>;
8080
using CompileVulkanToSpirv13TestQCOM = GlslangTest<::testing::TestWithParam<std::string>>;
81+
using CompileVulkanToSpirv14TestQCOM = GlslangTest<::testing::TestWithParam<std::string>>;
8182
using CompileVulkanToSpirvTestAMD = GlslangTest<::testing::TestWithParam<std::string>>;
8283
using CompileVulkanToSpirvTestNV = GlslangTest<::testing::TestWithParam<std::string>>;
8384
using CompileVulkanToSpirv14TestNV = GlslangTest<::testing::TestWithParam<std::string>>;
@@ -222,6 +223,12 @@ TEST_P(CompileVulkanToSpirv13TestQCOM, FromFile)
222223
Target::Spv);
223224
}
224225

226+
TEST_P(CompileVulkanToSpirv14TestQCOM, FromFile)
227+
{
228+
loadFileCompileAndCheck(GlobalTestSettings.testRoot, GetParam(),
229+
Source::GLSL, Semantics::Vulkan, glslang::EShTargetVulkan_1_1, glslang::EShTargetSpv_1_4,
230+
Target::Spv);
231+
}
225232

226233
// Compiling GLSL to SPIR-V under Vulkan semantics (AMD extensions enabled).
227234
// Expected to successfully generate SPIR-V.
@@ -919,15 +926,6 @@ INSTANTIATE_TEST_SUITE_P(
919926
INSTANTIATE_TEST_SUITE_P(
920927
Glsl, CompileVulkanToSpirvTestQCOM,
921928
::testing::ValuesIn(std::vector<std::string>({
922-
"spv.tpipSampleWeighted.frag",
923-
"spv.tpipBoxFilter.frag",
924-
"spv.tpipBlockMatchSSD.frag",
925-
"spv.tpipBlockMatchSAD.frag",
926-
"spv.tpipTextureArrays.frag",
927-
"spv.tpipBlockMatchGatherSAD.frag",
928-
"spv.tpipBlockMatchGatherSSD.frag",
929-
"spv.tpipBlockMatchWindowSAD.frag",
930-
"spv.tpipBlockMatchWindowSSD.frag",
931929
"spv.qcom.tileShading.0.comp",
932930
"spv.qcom.tileShading.1.comp",
933931
"spv.qcom.es.tileShading.0.comp",
@@ -950,6 +948,22 @@ INSTANTIATE_TEST_SUITE_P(
950948
FileNameAsCustomTestSuffix
951949
);
952950

951+
INSTANTIATE_TEST_SUITE_P(
952+
Glsl, CompileVulkanToSpirv14TestQCOM,
953+
::testing::ValuesIn(std::vector<std::string>({
954+
"spv.tpipSampleWeighted.frag",
955+
"spv.tpipBoxFilter.frag",
956+
"spv.tpipBlockMatchSSD.frag",
957+
"spv.tpipBlockMatchSAD.frag",
958+
"spv.tpipTextureArrays.frag",
959+
"spv.tpipBlockMatchGatherSAD.frag",
960+
"spv.tpipBlockMatchGatherSSD.frag",
961+
"spv.tpipBlockMatchWindowSAD.frag",
962+
"spv.tpipBlockMatchWindowSSD.frag",
963+
})),
964+
FileNameAsCustomTestSuffix
965+
);
966+
953967
INSTANTIATE_TEST_SUITE_P(
954968
Glsl, CompileVulkanToSpirvTestAMD,
955969
::testing::ValuesIn(std::vector<std::string>({

0 commit comments

Comments
 (0)