diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 4b36574b73a..ed7a80a2bb1 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -491,6 +491,8 @@ void		return VOID_TOK;
 
 layout		{
 		  if ((yyextra->is_version(140, 300))
+		      || yyextra->ARB_bindless_texture_enable
+		      || yyextra->KHR_blend_equation_advanced_enable
 		      || yyextra->AMD_conservative_depth_enable
 		      || yyextra->ARB_conservative_depth_enable
 		      || yyextra->ARB_explicit_attrib_location_enable