Mesa (master): glsl: Merge precision qualifiers too

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 73e2d69792fba229e52ea47165592d086e650c45
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=73e2d69792fba229e52ea47165592d086e650c45

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Aug  9 16:01:04 2013 -0700

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 at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Cc: "9.2" <mesa-stable at lists.freedesktop.org>

---

 src/glsl/ast_type.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index ce6b6a7..8aabd95 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;
 }