[Piglit] [PATCH 25/26] gen_constant_array_size_tests.py: PEP8 compliance
Dylan Baker
baker.dylan.c at gmail.com
Wed Jul 10 15:19:16 PDT 2013
---
generated_tests/gen_builtin_uniform_tests.py | 1 +
generated_tests/gen_constant_array_size_tests.py | 305 +++++++++++------------
2 files changed, 153 insertions(+), 153 deletions(-)
diff --git a/generated_tests/gen_builtin_uniform_tests.py b/generated_tests/gen_builtin_uniform_tests.py
index e0b6da2..fe105a6 100644
--- a/generated_tests/gen_builtin_uniform_tests.py
+++ b/generated_tests/gen_builtin_uniform_tests.py
@@ -52,6 +52,7 @@ import os
import os.path
import sys
+
def compute_offset_and_scale(test_vectors):
"""Compute scale and offset values such that for each result in
test_vectors, (result - offset) * scale is in the range [0.25,
diff --git a/generated_tests/gen_constant_array_size_tests.py b/generated_tests/gen_constant_array_size_tests.py
index c1baf54..b48d426 100644
--- a/generated_tests/gen_constant_array_size_tests.py
+++ b/generated_tests/gen_constant_array_size_tests.py
@@ -41,7 +41,6 @@ import os
import os.path
-
class ParserTest(object):
"""Class used to build a test of a single built-in. This is an
abstract base class--derived types should override test_suffix(),
@@ -49,154 +48,155 @@ class ParserTest(object):
"""
def __init__(self, signature, test_vectors):
- """Prepare to build a test for a single built-in. signature
- is the signature of the built-in (a key from the
- builtin_function.test_suite dict), and test_vectors is the
- list of test vectors for testing the given builtin (the
- corresponding value from the builtin_function.test_suite
- dict).
- """
- self.__signature = signature
- self.__test_vectors = test_vectors
+ """Prepare to build a test for a single built-in. signature
+ is the signature of the built-in (a key from the
+ builtin_function.test_suite dict), and test_vectors is the
+ list of test vectors for testing the given builtin (the
+ corresponding value from the builtin_function.test_suite
+ dict).
+ """
+ self.__signature = signature
+ self.__test_vectors = test_vectors
def glsl_version(self):
- if self.__signature.version_introduced < 120:
- # Before version 1.20, built-in function invocations
- # weren't allowed in constant expressions. So even if
- # this built-in was introduced prior to 1.20, test it in
- # version 1.20.
- return 120
- else:
- return self.__signature.version_introduced
+ if self.__signature.version_introduced < 120:
+ # Before version 1.20, built-in function invocations
+ # weren't allowed in constant expressions. So even if
+ # this built-in was introduced prior to 1.20, test it in
+ # version 1.20.
+ return 120
+ else:
+ return self.__signature.version_introduced
def version_directive(self):
- return '#version {0}\n'.format(self.glsl_version())
+ return '#version {0}\n'.format(self.glsl_version())
def additional_declarations(self):
- """Return a string containing any additional declarations that
- should be placed after the version directive. Returns the
- empty string by default.
- """
- return ''
+ """Return a string containing any additional declarations that
+ should be placed after the version directive. Returns the
+ empty string by default.
+ """
+ return ''
def additional_extensions(self):
- """Return a list (or other iterable) containing any additional
- extension requirements that the test has. Returns the empty
- list by default.
- """
- return []
+ """Return a list (or other iterable) containing any additional
+ extension requirements that the test has. Returns the empty
+ list by default.
+ """
+ return []
@abc.abstractmethod
def test_suffix(self):
- """Return the suffix that should be used in the test file name
- to identify the type of shader, e.g. "vert" for a vertex
- shader test.
- """
+ """Return the suffix that should be used in the test file name
+ to identify the type of shader, e.g. "vert" for a vertex
+ shader test.
+ """
def make_condition(self, test_vector):
- """Generate a GLSL constant expression that should evaluate to
- true if the GLSL compiler's constant evaluation produces the
- correct result for the given test vector, and false if not.
- """
- invocation = self.__signature.template.format(
- *[glsl_constant(x) for x in test_vector.arguments])
- if self.__signature.rettype.base_type == glsl_float:
- # Test floating-point values within tolerance
- if self.__signature.name == 'distance':
- # Don't use the distance() function to test itself.
- return '{0} <= {1} && {1} <= {2}'.format(
- test_vector.result - test_vector.tolerance,
- invocation,
- test_vector.result + test_vector.tolerance)
- elif self.__signature.rettype.is_matrix:
- # We can't apply distance() to matrices. So apply it
- # to each column and root-sum-square the results. It
- # is safe to use pow() here because its behavior is
- # verified in the pow() tests.
- terms = []
- for col in xrange(self.__signature.rettype.num_cols):
- terms.append('pow(distance({0}[{1}], {2}), 2)'.format(
- invocation, col,
- glsl_constant(test_vector.result[:,col])))
- rss_distance = ' + '.join(terms)
- sq_tolerance = test_vector.tolerance * test_vector.tolerance
- return '{0} <= {1}'.format(
- rss_distance, glsl_constant(sq_tolerance))
- else:
- return 'distance({0}, {1}) <= {2}'.format(
- invocation, glsl_constant(test_vector.result),
- glsl_constant(test_vector.tolerance))
- else:
- # Test non-floating point values exactly
- assert not self.__signature.rettype.is_matrix
- if self.__signature.name == 'equal':
- # Don't use the equal() function to test itself.
- assert self.__signature.rettype.is_vector
- terms = []
- for row in xrange(self.__signature.rettype.num_rows):
- terms.append('{0}[{1}] == {2}'.format(
- invocation, row,
- glsl_constant(test_vector.result[row])))
- return ' && '.join(terms)
- elif self.__signature.rettype.is_vector:
- return 'all(equal({0}, {1}))'.format(
- invocation, glsl_constant(test_vector.result))
- else:
- return '{0} == {1}'.format(
- invocation, glsl_constant(test_vector.result))
+ """Generate a GLSL constant expression that should evaluate to
+ true if the GLSL compiler's constant evaluation produces the
+ correct result for the given test vector, and false if not.
+ """
+ invocation = self.__signature.template.format(
+ *[glsl_constant(x) for x in test_vector.arguments])
+ if self.__signature.rettype.base_type == glsl_float:
+ # Test floating-point values within tolerance
+ if self.__signature.name == 'distance':
+ # Don't use the distance() function to test itself.
+ return '{0} <= {1} && {1} <= {2}'.format(
+ test_vector.result - test_vector.tolerance,
+ invocation,
+ test_vector.result + test_vector.tolerance)
+ elif self.__signature.rettype.is_matrix:
+ # We can't apply distance() to matrices. So apply it
+ # to each column and root-sum-square the results. It
+ # is safe to use pow() here because its behavior is
+ # verified in the pow() tests.
+ terms = []
+ for col in xrange(self.__signature.rettype.num_cols):
+ terms.append('pow(distance({0}[{1}], {2}), 2)'.format(
+ invocation, col,
+ glsl_constant(test_vector.result[:, col])))
+ rss_distance = ' + '.join(terms)
+ sq_tolerance = test_vector.tolerance * test_vector.tolerance
+ return '{0} <= {1}'.format(
+ rss_distance, glsl_constant(sq_tolerance))
+ else:
+ return 'distance({0}, {1}) <= {2}'.format(
+ invocation, glsl_constant(test_vector.result),
+ glsl_constant(test_vector.tolerance))
+ else:
+ # Test non-floating point values exactly
+ assert not self.__signature.rettype.is_matrix
+ if self.__signature.name == 'equal':
+ # Don't use the equal() function to test itself.
+ assert self.__signature.rettype.is_vector
+ terms = []
+ for row in xrange(self.__signature.rettype.num_rows):
+ terms.append('{0}[{1}] == {2}'.format(
+ invocation, row,
+ glsl_constant(test_vector.result[row])))
+ return ' && '.join(terms)
+ elif self.__signature.rettype.is_vector:
+ return 'all(equal({0}, {1}))'.format(
+ invocation, glsl_constant(test_vector.result))
+ else:
+ return '{0} == {1}'.format(
+ invocation, glsl_constant(test_vector.result))
def make_shader(self):
- """Generate the shader code necessary to test the built-in."""
- shader = self.version_directive()
- shader += self.additional_declarations()
- shader += '\n'
- shader += 'void main()\n'
- shader += '{\n'
- lengths = []
- for i, test_vector in enumerate(self.__test_vectors):
- shader += ' float[{0} ? 1 : -1] array{1};\n'.format(
- self.make_condition(test_vector), i)
- lengths.append('array{0}.length()'.format(i))
- shader += ' {0} = vec4({1});\n'.format(
- self.output_var(), ' + '.join(lengths))
- shader += '}\n'
- return shader
+ """Generate the shader code necessary to test the built-in."""
+ shader = self.version_directive()
+ shader += self.additional_declarations()
+ shader += '\n'
+ shader += 'void main()\n'
+ shader += '{\n'
+ lengths = []
+ for i, test_vector in enumerate(self.__test_vectors):
+ shader += ' float[{0} ? 1 : -1] array{1};\n'.format(
+ self.make_condition(test_vector), i)
+ lengths.append('array{0}.length()'.format(i))
+ shader += ' {0} = vec4({1});\n'.format(
+ self.output_var(), ' + '.join(lengths))
+ shader += '}\n'
+ return shader
def filename(self):
- argtype_names = '-'.join(
- str(argtype) for argtype in self.__signature.argtypes)
- return os.path.join(
- 'spec', 'glsl-{0:1.2f}'.format(float(self.glsl_version()) / 100),
- 'compiler', 'built-in-functions',
- '{0}-{1}.{2}'.format(
- self.__signature.name, argtype_names, self.test_suffix()))
+ argtype_names = '-'.join(
+ str(argtype) for argtype in self.__signature.argtypes)
+ return os.path.join(
+ 'spec', 'glsl-{0:1.2f}'.format(float(self.glsl_version()) / 100),
+ 'compiler', 'built-in-functions',
+ '{0}-{1}.{2}'.format(
+ self.__signature.name, argtype_names, self.test_suffix()))
def generate_parser_test(self):
- """Generate the test and write it to the output file."""
- parser_test = '/* [config]\n'
- parser_test += ' * expect_result: pass\n'
- parser_test += ' * glsl_version: {0:1.2f}\n'.format(float(self.glsl_version()) / 100)
- req_extensions = list(self.additional_extensions())
- if req_extensions:
- parser_test += ' * require_extensions: {0}\n'.format(
- ' '.join(req_extensions))
- parser_test += ' * [end config]\n'
- parser_test += ' *\n'
- parser_test += ' * Check that the following test vectors are constant folded correctly:\n'
- for test_vector in self.__test_vectors:
- parser_test += ' * {0} => {1}\n'.format(
- self.__signature.template.format(
- *[glsl_constant(arg) for arg in test_vector.arguments]),
- glsl_constant(test_vector.result))
- parser_test += ' */\n'
- parser_test += self.make_shader()
- filename = self.filename()
- dirname = os.path.dirname(filename)
- if not os.path.exists(dirname):
- os.makedirs(dirname)
- with open(filename, 'w') as f:
- f.write(parser_test)
-
+ """Generate the test and write it to the output file."""
+ parser_test = '/* [config]\n'
+ parser_test += ' * expect_result: pass\n'
+ parser_test += ' * glsl_version: {0:1.2f}\n'.format(
+ float(self.glsl_version()) / 100)
+ req_extensions = list(self.additional_extensions())
+ if req_extensions:
+ parser_test += ' * require_extensions: {0}\n'.format(
+ ' '.join(req_extensions))
+ parser_test += ' * [end config]\n'
+ parser_test += ' *\n'
+ parser_test += ' * Check that the following test vectors are constant'\
+ 'folded correctly:\n'
+ for test_vector in self.__test_vectors:
+ parser_test += ' * {0} => {1}\n'.format(
+ self.__signature.template.format(
+ *[glsl_constant(arg) for arg in test_vector.arguments]),
+ glsl_constant(test_vector.result))
+ parser_test += ' */\n'
+ parser_test += self.make_shader()
+ filename = self.filename()
+ dirname = os.path.dirname(filename)
+ if not os.path.exists(dirname):
+ os.makedirs(dirname)
+ with open(filename, 'w') as f:
+ f.write(parser_test)
class VertexParserTest(ParserTest):
@@ -204,11 +204,10 @@ class VertexParserTest(ParserTest):
shader.
"""
def test_suffix(self):
- return 'vert'
+ return 'vert'
def output_var(self):
- return 'gl_Position'
-
+ return 'gl_Position'
class GeometryParserTest(ParserTest):
@@ -216,17 +215,16 @@ class GeometryParserTest(ParserTest):
shader.
"""
def test_suffix(self):
- return 'geom'
+ return 'geom'
def additional_declarations(self):
- return '#extension GL_ARB_geometry_shader4: enable\n'
+ return '#extension GL_ARB_geometry_shader4: enable\n'
def additional_extensions(self):
- return ['GL_ARB_geometry_shader4']
+ return ['GL_ARB_geometry_shader4']
def output_var(self):
- return 'gl_Position'
-
+ return 'gl_Position'
class FragmentParserTest(ParserTest):
@@ -234,34 +232,35 @@ class FragmentParserTest(ParserTest):
shader.
"""
def test_suffix(self):
- return 'frag'
+ return 'frag'
def output_var(self):
- return 'gl_FragColor'
-
+ return 'gl_FragColor'
def all_tests():
for signature, test_vectors in sorted(test_suite.items()):
- yield VertexParserTest(signature, test_vectors)
- yield GeometryParserTest(signature, test_vectors)
- yield FragmentParserTest(signature, test_vectors)
-
+ yield VertexParserTest(signature, test_vectors)
+ yield GeometryParserTest(signature, test_vectors)
+ yield FragmentParserTest(signature, test_vectors)
def main():
- desc = 'Generate shader tests that test built-in functions using constant array sizes'
+ desc = 'Generate shader tests that test built-in functions using constant'\
+ 'array sizes'
usage = 'usage: %prog [-h] [--names-only]'
parser = optparse.OptionParser(description=desc, usage=usage)
- parser.add_option(
- '--names-only', dest='names_only', action='store_true',
- help="Don't output files, just generate a list of filenames to stdout")
+ parser.add_option('--names-only',
+ dest='names_only',
+ action='store_true',
+ help="Don't output files, just generate a list of"
+ "filenames to stdout")
options, args = parser.parse_args()
- for test in all_tests():
- if not options.names_only:
- test.generate_parser_test()
- print test.filename()
+ for test in all_tests():
+ if not options.names_only:
+ test.generate_parser_test()
+ print test.filename()
if __name__ == '__main__':
--
1.8.3.1
More information about the Piglit
mailing list