From 83bc101e00ba03fc4d81ef385c9cad5054b0950c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sun, 28 Aug 2016 11:38:29 -0400 Subject: [PATCH] frontend: always raise advice about missing glslangValidator MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- src/frontend/glsl_validation.nit | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/frontend/glsl_validation.nit b/src/frontend/glsl_validation.nit index 1d11589..f6f3760 100644 --- a/src/frontend/glsl_validation.nit +++ b/src/frontend/glsl_validation.nit @@ -58,9 +58,7 @@ private class GLSLValidationPhase # Do not double check if tool is in path var in_path = tool_is_in_path - if in_path != null then - if not in_path then return - else + if in_path == null then # Is _glslangValidator_ installed? var proc_which = new ProcessReader("which", "glslangValidator") proc_which.wait @@ -68,11 +66,12 @@ private class GLSLValidationPhase var status = proc_which.status in_path = status == 0 tool_is_in_path = in_path - if not in_path then - toolcontext.advice(nat.location, "glslvalidator", - "Warning: program `glslangValidator` not in PATH, cannot validate this shader.") - return - end + end + + if not in_path then + toolcontext.advice(nat.location, "glslvalidator", + "Warning: program `glslangValidator` not in PATH, cannot validate this shader.") + return end # Get the shader source -- 1.7.9.5