diff options
| author | Kristian Høgsberg Kristensen <[email protected]> | 2015-09-29 17:10:50 -0700 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <[email protected]> | 2015-10-01 14:24:29 -0700 |
| commit | 005c8e01062e8e88a86904b955d5422742bd32e7 (patch) | |
| tree | c32b3e01c2dd93257dc7255a8f3aa99a60551035 /src/glsl/ast.h | |
| parent | 337caee91078e3d83ff01b929a44a74600cde6a7 (diff) | |
| parent | cb758b892a7e62ff1f6187f2ca9ac543ff70a096 (diff) | |
Merge branch 'master' of ../mesa into vulkan
Diffstat (limited to 'src/glsl/ast.h')
| -rw-r--r-- | src/glsl/ast.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/glsl/ast.h b/src/glsl/ast.h index d8c6cea7832..4c314366133 100644 --- a/src/glsl/ast.h +++ b/src/glsl/ast.h @@ -491,6 +491,7 @@ struct ast_type_qualifier { /** \name Layout qualifiers for GL_ARB_uniform_buffer_object */ /** \{ */ unsigned std140:1; + unsigned std430:1; unsigned shared:1; unsigned packed:1; unsigned column_major:1; @@ -639,6 +640,9 @@ struct ast_type_qualifier { */ glsl_base_type image_base_type; + /** Flag to know if this represents a default value for a qualifier */ + bool is_default_qualifier; + /** * Return true if and only if an interpolation qualifier is present. */ @@ -1169,4 +1173,9 @@ extern void check_builtin_array_max_size(const char *name, unsigned size, YYLTYPE loc, struct _mesa_glsl_parse_state *state); +extern void _mesa_ast_process_interface_block(YYLTYPE *locp, + _mesa_glsl_parse_state *state, + ast_interface_block *const block, + const struct ast_type_qualifier q); + #endif /* AST_H */ |