[Mesa-dev] [PATCH 2/5] glsl: remove special case for detecting stream duplicates

Timothy Arceri timothy.arceri at collabora.com
Thu Jan 14 18:45:49 PST 2016


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

Cc: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
---
 src/glsl/ast_type.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index 19ffe83..1f675b2 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");
-         }
       }
    }
 
-- 
2.4.3



More information about the mesa-dev mailing list