From 855de9e44976e3f63fcb7b1c90542a015ff15ec5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Wed, 19 Aug 2015 15:22:46 -0400 Subject: [PATCH] tests: simplify glslValidator test to support different versions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix #1537. Signed-off-by: Alexis Laferrière --- tests/sav/test_glsl_validation.res | 2 -- tests/test_glsl_validation.nit | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/sav/test_glsl_validation.res b/tests/sav/test_glsl_validation.res index 7cb202c..ebd24c8 100644 --- a/tests/sav/test_glsl_validation.res +++ b/tests/sav/test_glsl_validation.res @@ -1,6 +1,4 @@ test_glsl_validation.nit:24,0: Shader error on 'binding' : not supported for this version or the enabled extensions test_glsl_validation.nit:24,0: Shader error on 'binding' : requires uniform or buffer storage qualifier test_glsl_validation.nit:24,0: Shader error on 'binding' : requires block, or sampler/image, or atomic-counter type -test_glsl_validation.nit:28,0: Shader error on 'gl_FragColor' : undeclared identifier -test_glsl_validation.nit:28,0: Shader error on 'assign' : cannot convert from 'mediump 4-component vector of float' to 'float' test_glsl_validation.nit:29,0: Shader error on 'b' : undeclared identifier diff --git a/tests/test_glsl_validation.nit b/tests/test_glsl_validation.nit index 950ef7b..147b67a 100644 --- a/tests/test_glsl_validation.nit +++ b/tests/test_glsl_validation.nit @@ -25,7 +25,7 @@ layout(binding = 0) out vec4 outColor; void main() { - gl_FragColor = v_color * texture(vTex, v_texCoord); + outColor = v_color * texture(vTex, v_texCoord); b; } """ @ glsl_fragment_shader -- 1.7.9.5