This makes the port a little less naive than it was before, and allows us to remove logic from the template, by using logic in the params instance.
Signed-off-by: Dylan Baker <[email protected]> --- .../templates/gen_variable_index_read_tests/helpers.mako | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/generated_tests/templates/gen_variable_index_read_tests/helpers.mako b/generated_tests/templates/gen_variable_index_read_tests/helpers.mako index dcbcb92..d75d936 100644 --- a/generated_tests/templates/gen_variable_index_read_tests/helpers.mako +++ b/generated_tests/templates/gen_variable_index_read_tests/helpers.mako @@ -141,13 +141,7 @@ void main() * written." */ % endif - ## TODO: Could probably simplify this with the use of params.row - % if params.expect_type == 'float': - color = (m${params.idx}[${params.col}][row] == expect) \ - % else: - color = (m${params.idx}[${params.col}] == expect) \ - % endif - ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); + color = (m${params.idx}[${params.col}]${params.row} == expect) ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0); % endif } </%def> -- 2.4.2 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
