Merge "Revert "Use smaller triangles in triangle_vertex.clip_three"" into marshmallow...

am: 543f748

* commit '543f7485e51afadbc0d8d966528f5f882f919b77':
  Revert "Use smaller triangles in triangle_vertex.clip_three"

Change-Id: If347fd1567d43ef1c922eabf944db9070612b3c2

diff --git a/modules/gles2/functional/es2fClippingTests.cpp b/modules/gles2/functional/es2fClippingTests.cpp
index 176af9c..71e74b0 100644 (file)
--- a/modules/gles2/functional/es2fClippingTests.cpp
+++ b/modules/gles2/functional/es2fClippingTests.cpp
@@ -1881,8 +1881,7 @@ PolyVertexClipTestGroup::PolyVertexClipTestGroup (Context& context)
 
 void PolyVertexClipTestGroup::init (void)
 {
-       const float far                                 = 30000.0f;
-       const float farForThreeVertex   = 20000.0f; // 3 vertex clipping tests use smaller triangles
+       const float far = 30000.0f;
        const tcu::IVec3 outside[] =
        {
                // outside one clipping plane
@@ -2024,9 +2023,9 @@ void PolyVertexClipTestGroup::init (void)
                const tcu::IVec3 r0             = outside[ndx1];
                const tcu::IVec3 r1             = outside[ndx2];
                const tcu::IVec3 r2             = outside[ndx3];
-               const tcu::Vec4 p0              = tcu::Vec4(r0.x() * farForThreeVertex * w0, r0.y() * farForThreeVertex * w0, r0.z() * farForThreeVertex * w0, w0);
-               const tcu::Vec4 p1              = tcu::Vec4(r1.x() * farForThreeVertex * w1, r1.y() * farForThreeVertex * w1, r1.z() * farForThreeVertex * w1, w1);
-               const tcu::Vec4 p2              = tcu::Vec4(r2.x() * farForThreeVertex * w2, r2.y() * farForThreeVertex * w2, r2.z() * farForThreeVertex * w2, w2);
+               const tcu::Vec4 p0              = tcu::Vec4(r0.x() * far * w0, r0.y() * far * w0, r0.z() * far * w0, w0);
+               const tcu::Vec4 p1              = tcu::Vec4(r1.x() * far * w1, r1.y() * far * w1, r1.z() * far * w1, w1);
+               const tcu::Vec4 p2              = tcu::Vec4(r2.x() * far * w2, r2.y() * far * w2, r2.z() * far * w2, w2);
 
                // ignore cases where polygon is along xz or yz planes
                if (pointsOnLine(r0.swizzle(0, 1), r1.swizzle(0, 1), r2.swizzle(0, 1)))