Mesa (master): glsl/cl: Properly emit layout qualifier list.

Michał Król michal at kemper.freedesktop.org
Wed Feb 17 10:22:11 UTC 2010


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

Author: Michal Krol <michal at vmware.com>
Date:   Wed Feb 17 09:54:59 2010 +0100

glsl/cl: Properly emit layout qualifier list.

---

 src/glsl/cl/sl_cl_parse.c |    6 +++---
 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 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);




More information about the mesa-commit mailing list