Make mesh modifier tests not fail with optimized OSD lib

When building opensubdiv with more aggressive optimization flags
(-march=native -02) the output meshes would differ a bit from what we
expected in the current automated modifier test file.

The differences in vertex position is within the 1e-6 range, which I
would call is acceptable for floats. In addition to this, all the
modifier test that tests the subdiv modifier in particular pass without
any modifications. I've updated two tests in the modifier test file and
script to make it pass (listed below).

Updated following test categories:

1. Decimate test

Here there was a subdiv modifier applied before the actual decimate
modifier. Because the decimate modifier creates a queue of potential
vertices it can remove, it is highly sensitive to even small changes as
it drastically changes in which order the vertices are decimated in.

As this test should only be testing the decimate modifier, I pre-applied
the subdiv modifier in the test file.

2. RandomCubeModifier
For these tests I removed the subdiv modifier as well. As with decimate,
a small change in vertex position here can lead to quite different
results.

Reviewed By: Sergey, Bastien

Differential Revision: http://developer.blender.org/D9004

1 files changed, 5 insertions, 7 deletions

diff --git a/tests/python/modifiers.py b/tests/python/modifiers.py
index 24f71c4066d..10393a0f493 100644
--- a/tests/python/modifiers.py
+++ b/tests/python/modifiers.py
@@ -64,7 +64,8 @@ def get_generate_modifiers_list(test_object_name, randomize=False):
         # ModifierSpec('screw', 'SCREW', {}), # screw can make the test very slow. Skipping for now.
 
         ModifierSpec('solidify', 'SOLIDIFY', {}),
-        ModifierSpec('subsurf', 'SUBSURF', {}),
+        # Opensubdiv results might differ slightly when compiled with different optimization flags.
+        #ModifierSpec('subsurf', 'SUBSURF', {}),
         ModifierSpec('triangulate', 'TRIANGULATE', {}),
         ModifierSpec('wireframe', 'WIREFRAME', {})
 
@@ -92,16 +93,13 @@ def main():
         MeshTest("CubeMaskFirst", "testCubeMaskFirst", "expectedCubeMaskFirst", mask_first_list),
 
         MeshTest("CollapseDecimate", "testCollapseDecimate", "expectedCollapseDecimate",
-                 [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2}),
-                  ModifierSpec('decimate', 'DECIMATE',
+                 [ModifierSpec('decimate', 'DECIMATE',
                                {'decimate_type': 'COLLAPSE', 'ratio': 0.25, 'use_collapse_triangulate': True})]),
         MeshTest("PlanarDecimate", "testPlanarDecimate", "expectedPlanarDecimate",
-                 [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2}),
-                  ModifierSpec('decimate', 'DECIMATE',
+                 [ModifierSpec('decimate', 'DECIMATE',
                                {'decimate_type': 'DISSOLVE', 'angle_limit': math.radians(30)})]),
         MeshTest("UnsubdivideDecimate", "testUnsubdivideDecimate", "expectedUnsubdivideDecimate",
-                 [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2}),
-                  ModifierSpec('decimate', 'DECIMATE', {'decimate_type': 'UNSUBDIV', 'iterations': 2})]),
+                 [ModifierSpec('decimate', 'DECIMATE', {'decimate_type': 'UNSUBDIV', 'iterations': 2})]),
 
         # 5
         MeshTest("RadialBisectMirror", "testRadialBisectMirror", "expectedRadialBisectMirror",