diff options
| author | Samuel Iglesias Gonsalvez <siglesias@igalia.com> | 2015-03-19 10:22:00 +0100 |
|---|---|---|
| committer | Samuel Iglesias Gonsalvez <siglesias@igalia.com> | 2015-07-14 07:04:04 +0200 |
| commit | 2747d566f187cdab5d6bdc508e460a76e5cbd6c4 (patch) | |
| tree | a33623a01507d36f45aa12ed2948e4c62bb942c5 | |
| parent | 9f651dbf7924938a8aa2c9c940ae3ed1366d6198 (diff) | |
glsl: fix error messages in invalid declarations of shader storage blocks
Due to GL_ARB_shader_storage_buffer_object extension, shader storage blocks
have the same limitations as uniform blocks.
This patch fixes the corresponding error messages.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 61020cf015..ca30dbc499 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -5382,7 +5382,7 @@ ast_process_structure_or_interface_block(exec_list *instructions, if (is_interface && field_type->contains_opaque()) { YYLTYPE loc = decl_list->get_location(); _mesa_glsl_error(&loc, state, - "uniform in non-default uniform block contains " + "uniform/buffer in non-default interface block contains " "opaque variable"); } @@ -5393,8 +5393,8 @@ ast_process_structure_or_interface_block(exec_list *instructions, * FINISHME: structures. */ YYLTYPE loc = decl_list->get_location(); - _mesa_glsl_error(&loc, state, "atomic counter in structure or " - "uniform block"); + _mesa_glsl_error(&loc, state, "atomic counter in structure, " + "shader storage block or uniform block"); } if (field_type->contains_image()) { @@ -5404,7 +5404,8 @@ ast_process_structure_or_interface_block(exec_list *instructions, */ YYLTYPE loc = decl_list->get_location(); _mesa_glsl_error(&loc, state, - "image in structure or uniform block"); + "image in structure, shader storage block or " + "uniform block"); } const struct ast_type_qualifier *const qual = @@ -5413,9 +5414,9 @@ ast_process_structure_or_interface_block(exec_list *instructions, qual->flags.q.packed || qual->flags.q.shared) { _mesa_glsl_error(&loc, state, - "uniform block layout qualifiers std140, packed, and " - "shared can only be applied to uniform blocks, not " - "members"); + "uniform/shader storage block layout qualifiers " + "std140, packed, and shared can only be applied " + "to uniform/shader storage blocks, not members"); } if (qual->flags.q.constant) { |