From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Fri, 15 Jan 2016 02:45:49 +0000 (+1100)
Subject: glsl: remove special case for detecting stream duplicates
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9258d9f23daca39767a41abc47836991a5f189b4;p=mesa.git

glsl: remove special case for detecting stream duplicates

Any duplicates in a single declaration will already fail the
generic duplicates test due to the explicit_stream flag being set.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
---

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index 19ffe833164..1f675b28ae8 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -208,11 +208,6 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
             this->flags.q.stream = 1;
             this->stream = state->out_qualifier->stream;
          }
-      } else {
-         if (q.flags.q.explicit_stream) {
-            _mesa_glsl_error(loc, state,
-                             "duplicate layout `stream' qualifier");
-         }
       }
    }