[Piglit] [PATCH 1/2] GLSL 1.50: Test that version 140 and version 150 shaders can be linked together

[Paul Berry]

On 27 September 2013 11:55, Nicholas Mack <nichmack at gmail.com> wrote:

> ---
>  .../glsl-1.50/linker/versions-mingled.shader_test  | 29
> ++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
>  create mode 100644
> tests/spec/glsl-1.50/linker/versions-mingled.shader_test
>
> diff --git a/tests/spec/glsl-1.50/linker/versions-mingled.shader_test
> b/tests/spec/glsl-1.50/linker/versions-mingled.shader_test
> new file mode 100644
> index 0000000..543a778
> --- /dev/null
> +++ b/tests/spec/glsl-1.50/linker/versions-mingled.shader_test
> @@ -0,0 +1,29 @@
> +# Tests that GLSL 1.40 and GLSL 1.50 shaders may be linked together
> +#
> +# GLSL 1.50 Spec, 3.3 ():
>

Were you meaning to put something between the parentheses?  (The section
name, "Preprocessor", perhaps?)

The same comment applies to patch 2.

With that fixed, the series is:

Reviewed-by: Paul Berry <stereotype441 at gmail.com>


> +# "Shaders declaring version 1.40 of the shading language can be linked
> with
> +#  shaders declaring version 1.50 in the same program."
> +[require]
> +GLSL >= 1.50
> +
> +[vertex shader]
> +#version 140
> +
> +in vec4 a;
> +
> +void main()
> +{
> +       gl_Position = a;
> +}
> +
> +[fragment shader]
> +#version 150
> +
> +void main()
> +{
> +       gl_FragColor = vec4(1.);
> +}
> +
> +[test]
> +
> +
> --
> 1.8.3.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20131007/ad69efaa/attachment.html>