summaryrefslogtreecommitdiff
path: root/src/glsl/glsl_parser.yy
diff options
context:
space:
mode:
Diffstat (limited to 'src/glsl/glsl_parser.yy')
-rw-r--r--src/glsl/glsl_parser.yy7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 4636435f19..e6a9db3094 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -1255,7 +1255,7 @@ layout_qualifier_id:
}
}
- if ($$.flags.i && !state->is_version(150, 0)) {
+ if ($$.flags.i && !state->is_version(150, 310)) {
_mesa_glsl_error(& @1, state, "#version 150 layout "
"qualifier `%s' used", $1);
}
@@ -1371,6 +1371,7 @@ layout_qualifier_id:
if ($$.flags.i &&
!state->ARB_tessellation_shader_enable &&
+ !state->EXT_tessellation_shader_enable &&
!state->is_version(400, 0)) {
_mesa_glsl_error(& @1, state,
"primitive mode qualifier `%s' requires "
@@ -1396,6 +1397,7 @@ layout_qualifier_id:
if ($$.flags.i &&
!state->ARB_tessellation_shader_enable &&
+ !state->EXT_tessellation_shader_enable &&
!state->is_version(400, 0)) {
_mesa_glsl_error(& @1, state,
"vertex spacing qualifier `%s' requires "
@@ -1413,6 +1415,7 @@ layout_qualifier_id:
if ($$.flags.i &&
!state->ARB_tessellation_shader_enable &&
+ !state->EXT_tessellation_shader_enable &&
!state->is_version(400, 0)) {
_mesa_glsl_error(& @1, state,
"ordering qualifier `%s' requires "
@@ -1427,6 +1430,7 @@ layout_qualifier_id:
if ($$.flags.i &&
!state->ARB_tessellation_shader_enable &&
+ !state->EXT_tessellation_shader_enable &&
!state->is_version(400, 0)) {
_mesa_glsl_error(& @1, state,
"qualifier `point_mode' requires "
@@ -1586,6 +1590,7 @@ layout_qualifier_id:
} else {
$$.vertices = $3;
if (!state->ARB_tessellation_shader_enable &&
+ !state->EXT_tessellation_shader_enable &&
!state->is_version(400, 0)) {
_mesa_glsl_error(& @1, state,
"vertices qualifier requires GLSL 4.00 or "