From: Jean Privat Date: Thu, 1 Sep 2016 01:53:17 +0000 (-0400) Subject: Merge: frontend: make the warning on unavailable glslangValidator an advice X-Git-Url: http://nitlanguage.org?hp=4278dfa8be17442ea5ad726c917945ca2dff2e92 Merge: frontend: make the warning on unavailable glslangValidator an advice Changes the following warning to an advice and raise it at each use of the annotations (instead of only once). ~~~ /nit/lib/gamnit/flat.nit:355,9--26: Warning: program `glslangValidator` not in PATH, cannot validate this shader. (glslvalidator) """ @ glsl_vertex_shader ~~~ Pull-Request: #2299 Reviewed-by: Jean Privat Reviewed-by: Lucas Bajolet --- diff --git a/src/frontend/glsl_validation.nit b/src/frontend/glsl_validation.nit index 2d61ce0..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.warning(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