diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-06-14 09:52:21 +1000 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-15 13:55:04 -0700 |
| commit | 156d0230a58400f195f46180da9b448a2a7a40f1 (patch) | |
| tree | ae047cb33c057f86903f06a68b76989615042f46 | |
| parent | 49f43bdcbf5b3b3743b067ea60343f2f8ac911c7 (diff) | |
glsl: allow standalone semicolons outside main()
GLSL 4.60 offically added this but games and older CTS suites actually
had shaders that did this, we may as well enable it everywhere.
Adding stable because it appears apps in the wild do this.
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Cc: <mesa-stable@lists.freedesktop.org>
(cherry picked from commit babd1d526be4690204964f5e0a42f5df12f7f83b)
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index e5ea41d4df..d44afb522f 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -2676,6 +2676,7 @@ external_declaration: | declaration { $$ = $1; } | pragma_statement { $$ = NULL; } | layout_defaults { $$ = $1; } + | ';' { $$ = NULL; } ; function_definition: |