diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2018-05-09 11:57:03 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2018-05-22 09:55:42 -0700 |
| commit | 3ecdac4569f8a21d4767381eb45fa8f597e53862 (patch) | |
| tree | 0af5ab3bf4a60fa5b7db9e18b05b2a9e423c5819 /generated_tests | |
| parent | 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d (diff) | |
Fix bogus assertions in builtin uniform test generator.
self.test_rows is measured in a number of 4x4 rectangles, but y is
measured in pixels, so they are not comparable. The only reason this
doesn't trip is because self.test_rows is currently the number of 4x4
rectangles that can fit in a 250x250 window (62)...and no test has
nearly that many rows of rectangles.
Instead, just assert y fits in the window height.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Diffstat (limited to 'generated_tests')
| -rw-r--r-- | generated_tests/gen_builtin_uniform_tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generated_tests/gen_builtin_uniform_tests.py b/generated_tests/gen_builtin_uniform_tests.py index 50cced444..ac09a64fc 100644 --- a/generated_tests/gen_builtin_uniform_tests.py +++ b/generated_tests/gen_builtin_uniform_tests.py @@ -386,7 +386,7 @@ class ShaderTest(object): def draw_command(self, test_num): x = (test_num % self.tests_per_row) * self.rect_width y = (test_num // self.tests_per_row) * self.rect_height - assert(y < self.test_rows) + assert(y + self.rect_height <= self.win_height) return 'draw rect ortho {0} {1} {2} {3}\n'.format(x, y, self.rect_width, self.rect_height) @@ -662,7 +662,7 @@ class TessellationShaderTest(ShaderTest): def draw_command(self, test_num): x = (test_num % self.tests_per_row) * self.rect_width y = (test_num // self.tests_per_row) * self.rect_height - assert(y < self.test_rows) + assert(y + self.rect_height <= self.win_height) return 'draw rect ortho patch {0} {1} {2} {3}\n'.format(x, y, self.rect_width, self.rect_height) |