diff options
| author | Andres Gomez <agomez@igalia.com> | 2016-07-01 15:12:02 +0300 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2016-07-02 02:23:11 +0300 |
| commit | 49a564431d5617953026b66105a8c6d558cc0301 (patch) | |
| tree | 140e5b0266475b669e5add8bcb10b8d42e38315f /generated_tests | |
| parent | f49a92d0291dc939dbab83e22f82cac6145c10d2 (diff) | |
util: Add u/byte, u/short and half support to [vertex data]
This allows to set data of u/byte, u/short and half types for
attributes with the shader runner.
For example:
0/byte/int attname1/ushort/uint attname3/half/float
The syntax has been extended so the recommended way has replaced the
old COUNT field in the [vertex data] header line with the
corresponding GLSL type for the old TYPE field.
In any case, the extended syntax is backward compatible so it is still
possible to specify a vec3 attribute like:
attname/float/3
In addition to the now recommended format:
attname/float/vec3
Due to this, the arb_vertex_attrib_64bit input tests generator has
been also adapted to the new syntax.
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Diffstat (limited to 'generated_tests')
| -rw-r--r-- | generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako | 4 | ||||
| -rw-r--r-- | generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako b/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako index 241c02bbf..2dfb723ad 100644 --- a/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako +++ b/generated_tests/templates/gen_vs_in_fp64/columns.shader_test.mako @@ -84,9 +84,9 @@ void main() } [vertex data] -piglit_vertex/vec3/3\ +piglit_vertex/float/vec3\ % for i in range(mat.columns): - value/${mat.name}/${mat.rows}${'/{}'.format(i) if mat.columns > 1 else ''}\ + value/double/${mat.name}${'/{}'.format(i) if mat.columns > 1 else ''}\ % endfor % for d in range(len(dvalues)): diff --git a/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako b/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako index d091f6b29..05532122b 100644 --- a/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako +++ b/generated_tests/templates/gen_vs_in_fp64/regular.shader_test.mako @@ -88,16 +88,16 @@ void main() [vertex data] % for idx, in_type in enumerate(in_types): % if idx == position_order - 1: - piglit_vertex/vec3/3 \ + piglit_vertex/float/vec3 \ % endif % for i in range(arrays[idx]): % for j in range(in_type.columns): - value${idx}${'[{}]'.format(i) if arrays[idx] > 1 else ''}/${in_type.name}/${(in_type.rows)}${'/{}'.format(j) if (in_type.columns or 0) > 1 else ''} \ + value${idx}${'[{}]'.format(i) if arrays[idx] > 1 else ''}/${in_type.type.name}/${in_type.name}${'/{}'.format(j) if (in_type.columns or 0) > 1 else ''} \ % endfor % endfor % endfor % if position_order > len(in_types): - piglit_vertex/vec3/3\ + piglit_vertex/float/vec3\ % endif % for d in range(len(dvalues)): |