[Piglit] [RFC 11/12] gen_builtin_uniform_tests.py: Enable CS tests for fp64

[Dylan Baker]

---
 generated_tests/gen_builtin_uniform_tests.py | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/generated_tests/gen_builtin_uniform_tests.py b/generated_tests/gen_builtin_uniform_tests.py
index 7df2e7b..550088d 100644
--- a/generated_tests/gen_builtin_uniform_tests.py
+++ b/generated_tests/gen_builtin_uniform_tests.py
@@ -45,6 +45,7 @@ doesn't generate them.
 
 from __future__ import absolute_import, print_function
 import os
+import itertools
 
 import builtin_function
 import builtin_function_fp64
@@ -128,14 +129,9 @@ def generate(signature, vectors, use_if, stage):
 
 
 def all_tests():
-    for signature, test_vectors in builtin_function.test_suite.iteritems():
-        yield signature, test_vectors, False
-        if signature.rettype == glsl_types.GLSL_BOOL:
-            yield signature, test_vectors, True
-
-
-def fp64_tests():
-    for signature, test_vectors in builtin_function_fp64.test_suite.iteritems():
+    for signature, test_vectors in itertools.chain(
+            builtin_function.test_suite.iteritems(),
+            builtin_function_fp64.test_suite.iteritems()):
         yield signature, test_vectors, False
         if signature.rettype == glsl_types.GLSL_BOOL:
             yield signature, test_vectors, True
@@ -145,9 +141,6 @@ def main():
     for sig, vecs, use_if in all_tests():
         for stage in ['vs', 'fs', 'gs', 'cs']:
             generate(sig, vecs, use_if, stage)
-    for sig, vecs, use_if in fp64_tests():
-        for stage in ['vs', 'fs', 'gs']:
-            generate(sig, vecs, use_if, stage)
 
 
 if __name__ == '__main__':
-- 
2.2.0