From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 9 Aug 2013 23:01:04 +0000 (-0700)
Subject: glsl: Merge precision qualifiers too
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73e2d69792fba229e52ea47165592d086e650c45;p=mesa.git

glsl: Merge precision qualifiers too

We never noticed this before because we previously didn't enfoce GLSL ES
fragement shader requirements that precision be defined.  There may also
have been some interaction here with the addition of
GL_ARB_shading_language_420pack, but it doesn't appear to me that it
added any new bugs (just perhaps uncovered some old ones).

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Cc: "9.2" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index ce6b6a77145..8aabd95f999 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -168,6 +168,9 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
    if (q.flags.q.explicit_binding)
       this->binding = q.binding;
 
+   if (q.precision != ast_precision_none)
+      this->precision = q.precision;
+
    return true;
 }