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

glsl: Properly handle .length() of an unsized array 

There are two distinct cases:
- The last member of a shader storage block (length determined at run-time)
- Implicitly-sized array (length determined at link-time)

Fixes: 273f61a005 ("glsl: Add parser/compiler support for unsized array's length()")
Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11952>
This commit is contained in:
Yevhenii Kolesnikov 2021-07-14 20:52:56 +03:00 committed by Marge Bot
parent 441826aaaa
commit c3f47f6e30
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/glsl/ast_function.cpp
View File

@ -2047,10 +2047,18 @@ ast_function_expression::handle_method(exec_list *instructions,
"length called on unsized array"
" only available with"
" ARB_shader_storage_buffer_object");
goto fail;
} else if (op->variable_referenced()->is_in_shader_storage_block()) {
/* Calculate length of an unsized array in run-time */
result = new(ctx)
ir_expression(ir_unop_ssbo_unsized_array_length, op);
} else {
/* When actual size is known at link-time, this will be
* replaced with a constant expression.
*/
result = new (ctx)
ir_expression(ir_unop_implicitly_sized_array_length, op);
}
/* Calculate length of an unsized array in run-time */
result = new(ctx) ir_expression(ir_unop_ssbo_unsized_array_length,
op);
} else {
result = new(ctx) ir_constant(op->type->array_size());
}