diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2015-10-15 14:47:34 -0700 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2015-10-31 23:17:06 -0700 |
| commit | 218e94906d877889b2b124187d8e17b7f0879122 (patch) | |
| tree | 9877bde72317da429c72736aeede7038b570e949 /src | |
| parent | b6e9b2b7a0affabd80f14d63284cd0ffe4745136 (diff) | |
| download | external_mesa3d-218e94906d877889b2b124187d8e17b7f0879122.zip external_mesa3d-218e94906d877889b2b124187d8e17b7f0879122.tar.gz external_mesa3d-218e94906d877889b2b124187d8e17b7f0879122.tar.bz2 | |
glsl: OpenGLES GLSL 3.1 precision qualifiers ordering rules
The OpenGLES GLSL 3.1 specification uses the precision qualifier
ordering rules from ARB_shading_language_420pack.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 2f2e10d..4636435 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -948,7 +948,8 @@ parameter_qualifier: if ($2.precision != ast_precision_none) _mesa_glsl_error(&@1, state, "duplicate precision qualifier"); - if (!state->has_420pack() && $2.flags.i != 0) + if (!(state->has_420pack() || state->is_version(420, 310)) && + $2.flags.i != 0) _mesa_glsl_error(&@1, state, "precision qualifiers must come last"); $$ = $2; @@ -1847,7 +1848,8 @@ type_qualifier: if ($2.precision != ast_precision_none) _mesa_glsl_error(&@1, state, "duplicate precision qualifier"); - if (!state->has_420pack() && $2.flags.i != 0) + if (!(state->has_420pack() || state->is_version(420, 310)) && + $2.flags.i != 0) _mesa_glsl_error(&@1, state, "precision qualifiers must come last"); $$ = $2; |