Update RecursiveComparison tests to run on GPU.

These tests are not guaranteed to pass in ES2 (as ES2 specifically does
not require NaN to be implemented), so they are now run in GPU+ES3 and
on the CPU.

Change-Id: Ica78e15a06b3b00b651c5fabd0decf751853a83f
Bug: skia:12858
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/501238
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2022-02-02 11:59:34 -05:00 committed by SkCQ
parent 55a69d1de0
commit a3b11365b4
3 changed files with 78 additions and 71 deletions

View File

@ -932,6 +932,13 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
skip("_", "tests", "_", "SkSLStructsInFunctions_GPU") // skia:11929
}
if b.matchGpu("Adreno6") || b.matchGpu("MaliG77") || b.matchGpu("QuadroP400") {
skip("_", "tests", "_", "SkSLRecursiveComparison_Arrays_GPU") // skia:12642
skip("_", "tests", "_", "SkSLRecursiveComparison_Structs_GPU")
skip("_", "tests", "_", "SkSLRecursiveComparison_Types_GPU")
skip("_", "tests", "_", "SkSLRecursiveComparison_Vectors_GPU")
}
if b.matchGpu("Adreno6") && !b.extraConfig("Vulkan") { // disable broken tests on Adreno 6xx GLSL
skip("_", "tests", "_", "SkSLIntrinsicIsInf_GPU") // skia:12377
}

File diff suppressed because one or more lines are too long

View File

@ -346,9 +346,9 @@ SKSL_TEST(SkSLLoopInt, "runtime/LoopInt.rts")
SKSL_TEST(SkSLQualifierOrder, "runtime/QualifierOrder.rts")
SKSL_TEST(SkSLPrecisionQualifiers, "runtime/PrecisionQualifiers.rts")
SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Arrays, "runtime/RecursiveComparison_Arrays.rts")
SKSL_TEST_CPU(SkSLRecursiveComparison_Structs, "runtime/RecursiveComparison_Structs.rts")
SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Structs, "runtime/RecursiveComparison_Structs.rts")
SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Types, "runtime/RecursiveComparison_Types.rts")
SKSL_TEST_CPU(SkSLRecursiveComparison_Vectors, "runtime/RecursiveComparison_Vectors.rts")
SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Vectors, "runtime/RecursiveComparison_Vectors.rts")
SKSL_TEST_ES3(SkSLArrayComparison, "shared/ArrayComparison.sksl")
SKSL_TEST_ES3(SkSLArrayConstructors, "shared/ArrayConstructors.sksl")