KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Samuel Iglesias Gonsalvez 2015-03-19 10:22:00 +01:00
parent 9f651dbf79
commit 2747d566f1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/glsl/ast_to_hir.cpp
View File

@ -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) {