diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-30 08:58:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-30 08:58:27 +0200 |
| commit | a12cf779e828ec70da714832e1eaa730119fe10c (patch) | |
| tree | dc99a80ba8d23ac18d2a33ebaa4cbdeef65ffb72 /mesalib/src/glsl/glsl_parser.yy | |
| parent | 14718f10dcda487178690de9a51cc5acdf21e468 (diff) | |
| download | vcxsrv-a12cf779e828ec70da714832e1eaa730119fe10c.tar.gz vcxsrv-a12cf779e828ec70da714832e1eaa730119fe10c.tar.bz2 vcxsrv-a12cf779e828ec70da714832e1eaa730119fe10c.zip | |
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7
libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
pixman commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5
fontconfig commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397
mesa commit 868791f0baa0b51f4255c839448d3ca87ab1aa35
Diffstat (limited to 'mesalib/src/glsl/glsl_parser.yy')
| -rw-r--r-- | mesalib/src/glsl/glsl_parser.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy index fa6e2053a..912931a47 100644 --- a/mesalib/src/glsl/glsl_parser.yy +++ b/mesalib/src/glsl/glsl_parser.yy @@ -1200,7 +1200,7 @@ layout_qualifier_id: } /* See also interface_block_layout_qualifier. */ - if (!$$.flags.i && state->ARB_uniform_buffer_object_enable) { + if (!$$.flags.i && state->has_uniform_buffer_objects()) { if (strcmp($1, "std140") == 0) { $$.flags.q.std140 = 1; } else if (strcmp($1, "shared") == 0) { @@ -1262,7 +1262,7 @@ layout_qualifier_id: { memset(& $$, 0, sizeof($$)); - if (state->ARB_explicit_attrib_location_enable) { + if (state->has_explicit_attrib_location()) { if (strcmp("location", $1) == 0) { $$.flags.q.explicit_location = 1; @@ -1328,7 +1328,7 @@ layout_qualifier_id: { $$ = $1; /* Layout qualifiers for ARB_uniform_buffer_object. */ - if ($$.flags.q.uniform && !state->ARB_uniform_buffer_object_enable) { + if ($$.flags.q.uniform && !state->has_uniform_buffer_objects()) { _mesa_glsl_error(& @1, state, "#version 140 / GL_ARB_uniform_buffer_object " "layout qualifier `%s' is used", $1); @@ -2138,7 +2138,7 @@ basic_interface_block: block->declarations.push_degenerate_list_at_head(& $4->link); if ($1.flags.q.uniform) { - if (!state->ARB_uniform_buffer_object_enable) { + if (!state->has_uniform_buffer_objects()) { _mesa_glsl_error(& @1, state, "#version 140 / GL_ARB_uniform_buffer_object " "required for defining uniform blocks"); |