fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl2: Add support for the .length() method on arrays.

Browse source 
Fixes piglit test glsl-array-length, and provides proper error messages
for negative piglit tests array-length-110.frag, array-length-unsized.frag,
and array-length-args.frag.
This commit is contained in:
Kenneth Graunke 2010-07-17 22:50:26 -07:00 • committed by Ian Romanick
parent 1036a7ebae
commit 094cf8c199
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/glsl/hir_field_selection.cpp
View file

@ -71,6 +71,28 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
"structure",
expr->primary_expression.identifier);
}
} else if (expr->subexpressions[1] != NULL) {
/* Handle "method calls" in GLSL 1.20 - namely, array.length() */
if (state->language_version < 120)
_mesa_glsl_error(&loc, state, "Methods not supported in GLSL 1.10.");
ast_expression *call = expr->subexpressions[1];
assert(call->oper == ast_function_call);
const char *method;
method = call->subexpressions[0]->primary_expression.identifier;
if (op->type->is_array() && strcmp(method, "length") == 0) {
if (!call->expressions.is_empty())
_mesa_glsl_error(&loc, state, "length method takes no arguments.");
if (op->type->array_size() == 0)
_mesa_glsl_error(&loc, state, "length called on unsized array.");
result = new(ctx) ir_constant(op->type->array_size());
} else {
_mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method);
}
} else {
_mesa_glsl_error(& loc, state, "Cannot access field `%s' of "
"non-structure / non-vector.",