summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Krol <michal@vmware.com>2010-02-17 09:54:59 +0100
committerMichal Krol <michal@vmware.com>2010-02-17 11:21:58 +0100
commita21215a74e56a8661e6191ec09d1be9c0a186111 (patch)
tree58a3a5d250596fb3e69b6c4a185180498bf85269
parentba0ac64f06e7b6d9c7c1440b7e3fbc9007af88ff (diff)
glsl/cl: Properly emit layout qualifier list.
-rw-r--r--src/glsl/cl/sl_cl_parse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c
index 883bc1ffd3..f635375c9b 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);