Mesa (master): glsl/es3.1: Allow separate shader objects in GLSL ES 3.10

[Ian Romanick]

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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Apr 28 12:46:46 2015 -0700

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

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

---

 src/glsl/glsl_parser_extras.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index b3c8a1d..00fcc75 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;
    }