[Piglit] [PATCH] layout-std140-base-size-and-alignment: Fix running the test.

[Ian Romanick]

On 02/19/2013 12:00 PM, Eric Anholt wrote:
> The shaders compile failed as of
> 10628a004e18190b015bacf7640b638c51db82d0
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59648
> ---
>   .../layout-std140-base-size-and-alignment.c                          |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c b/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c
> index 5797647..68388a2 100644
> --- a/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c
> +++ b/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c
> @@ -62,7 +62,7 @@ test_format(const struct uniform_type *type, bool row_major)
>   		"};\n"
>   		"\n"
>   		"void main() {\n"
> -		"	gl_FragColor = vec4(pad + %s + size_test);\n"
> +		"	gl_FragColor = vec4(pad) + vec4(%s) + vec4(size_test);\n"
>   		"}\n";
>   	char *fs_source;
>   	GLuint fs, prog;
>

Grak.  We did it again. :(  I used float casts because the %s is always 
a scalar type and the pad and size_test fields are already float.

Opinion?  I'll give my R-b for whichever one you like better. :)