From: Michal Krol <michal@vmware.com>
Date: Wed, 17 Feb 2010 08:54:59 +0000 (+0100)
Subject: glsl/cl: Properly emit layout qualifier list.
X-Git-Tag: mesa-7.8~708
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a21215a74e56a8661e6191ec09d1be9c0a186111;p=platform%2Fupstream%2Fmesa.git

glsl/cl: Properly emit layout qualifier list.
---

diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c
index 883bc1f..f635375 100644
--- a/src/glsl/cl/sl_cl_parse.c
+++ b/src/glsl/cl/sl_cl_parse.c
@@ -760,10 +760,9 @@ _parse_layout_qualifier(struct parse_context *ctx,
             return -1;
          }
       }
-
    }
 
-   return -1;
+   return 0;
 }
 
 
@@ -1068,8 +1067,9 @@ _parse_fully_specified_type(struct parse_context *ctx,
    struct parse_state p = *ps;
 
    if (_parse_layout_qualifier(ctx, &p)) {
-      _emit(ctx, &p.out, LAYOUT_QUALIFIER_NONE);
+      return -1;
    }
+   _emit(ctx, &p.out, LAYOUT_QUALIFIER_NONE);
 
    if (_parse_invariant_qualifier(ctx, &p)) {
       _emit(ctx, &p.out, TYPE_VARIANT);