From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 28 Apr 2015 19:46:46 +0000 (-0700)
Subject: glsl/es3.1: Allow separate shader objects in GLSL ES 3.10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dd61475d56f3b94c3586889333931ebe50a32c3e;p=mesa.git

glsl/es3.1: Allow separate shader objects in GLSL ES 3.10

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
---

diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index b3c8a1d2d4b..00fcc75ca06 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -160,7 +160,7 @@ struct _mesa_glsl_parse_state {
    {
       if (!this->has_separate_shader_objects()) {
          const char *const requirement = this->es_shader
-            ? "GL_EXT_separate_shader_objects extension"
+            ? "GL_EXT_separate_shader_objects extension or GLSL ES 310"
             : "GL_ARB_separate_shader_objects extension or GLSL 420";
 
          _mesa_glsl_error(locp, this, "%s explicit location requires %s",
@@ -217,7 +217,7 @@ struct _mesa_glsl_parse_state {
 
    bool has_separate_shader_objects() const
    {
-      return ARB_separate_shader_objects_enable || is_version(410, 0)
+      return ARB_separate_shader_objects_enable || is_version(410, 310)
          || EXT_separate_shader_objects_enable;
    }