From b802d8a74b19daa161a07eca2a90bc4620b94021 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jarkko=20P=C3=B6yry?= Date: Thu, 26 Mar 2015 11:26:34 -0700 Subject: [PATCH] Reapply changes lost in a merge gone bad. - Merge of mirror-m-wireless-internal-release branch reverted changes that were applied to both master and backported to lmp branches. This change reapplies the reverted changes. Changes are: * bug 19543772 -- Remove io_blocks.match_different_member_interpolation test from mustpass. * bug 19543594 -- Apply fix for tessellation fractional even test verification. Bug: 19936763 Change-Id: Ibc357e0e13d7993c91a4f4d60500dccb924eadec --- android/cts/com.drawelements.deqp.gles31.xml | 1 - android/cts/es31-lmp-mr1.txt | 1 - android/cts/es31-lmp.txt | 1 - modules/gles31/functional/es31fTessellationTests.cpp | 8 +++++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/android/cts/com.drawelements.deqp.gles31.xml b/android/cts/com.drawelements.deqp.gles31.xml index 7e6e487..768cbc5 100644 --- a/android/cts/com.drawelements.deqp.gles31.xml +++ b/android/cts/com.drawelements.deqp.gles31.xml @@ -15445,7 +15445,6 @@ - diff --git a/android/cts/es31-lmp-mr1.txt b/android/cts/es31-lmp-mr1.txt index 6a0b58f..96833a1 100644 --- a/android/cts/es31-lmp-mr1.txt +++ b/android/cts/es31-lmp-mr1.txt @@ -13015,7 +13015,6 @@ dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_orde dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_type dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_name dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_precision -dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_interpolation dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_array_size dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_struct_names dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_struct_member_name diff --git a/android/cts/es31-lmp.txt b/android/cts/es31-lmp.txt index d98482c..05e7d95 100644 --- a/android/cts/es31-lmp.txt +++ b/android/cts/es31-lmp.txt @@ -12602,7 +12602,6 @@ dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_orde dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_type dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_name dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_precision -dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_interpolation dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_array_size dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_struct_names dEQP-GLES31.functional.separate_shader.validation.io_blocks.mismatch_member_struct_member_name diff --git a/modules/gles31/functional/es31fTessellationTests.cpp b/modules/gles31/functional/es31fTessellationTests.cpp index 5f77cd9..f3f938a 100644 --- a/modules/gles31/functional/es31fTessellationTests.cpp +++ b/modules/gles31/functional/es31fTessellationTests.cpp @@ -1325,6 +1325,12 @@ static bool verifyFractionalSpacingSingle (TestLog& log, SpacingMode spacingMode return false; } } + else + { + // We have 2 segmentsA and 2 segmentsB, ensure segmentsB has the shorter lengths + if (segmentsB[0].length > segmentsA[0].length) + std::swap(segmentsA, segmentsB); + } // Check that the additional segments are placed symmetrically. if (segmentsB[0].index + segmentsB[1].index + 1 != (int)segments.size()) @@ -1341,8 +1347,8 @@ static bool verifyFractionalSpacingSingle (TestLog& log, SpacingMode spacingMode additionalSegmentLocationDst = de::min(segmentsB[0].index, segmentsB[1].index); else additionalSegmentLocationDst = segmentsB[0].length < segmentsA[0].length - 0.001f ? de::min(segmentsB[0].index, segmentsB[1].index) - : segmentsA[0].length < segmentsB[0].length - 0.001f ? de::min(segmentsA[0].index, segmentsA[1].index) : -1; // \note -1 when can't reliably decide which ones are the additional segments, a or b. + return true; } } -- 2.7.4