OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir_reader: Add support for reading constant arrays.

Browse Source
This commit is contained in:
Kenneth Graunke
2010-07-20 01:53:07 -07:00
parent 9930d18c2a
commit ef2c38b245
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/glsl/ir_reader.cpp
View File

@@ -753,7 +753,7 @@ read_constant(_mesa_glsl_parse_state *st, s_list *list)
{ {
void *ctx = st; void *ctx = st;
if (list->length() != 3) { if (list->length() != 3) {
ir_read_error(st, list, "expected (constant <type> (<num> ... <num>))"); ir_read_error(st, list, "expected (constant <type> (...))");
return NULL; return NULL;
} }
@@ -764,10 +764,35 @@ read_constant(_mesa_glsl_parse_state *st, s_list *list)
s_list *values = SX_AS_LIST(type_expr->next); s_list *values = SX_AS_LIST(type_expr->next);
if (values == NULL) { if (values == NULL) {
ir_read_error(st, list, "expected (constant <type> (<num> ... <num>))"); ir_read_error(st, list, "expected (constant <type> (...))");
return NULL; return NULL;
} }
if (type->is_array()) {
const unsigned elements_supplied = values->length();
if (elements_supplied != type->length) {
ir_read_error(st, values, "expected exactly %u array elements, "
"given %u", type->length, elements_supplied);
return NULL;
}
exec_list elements;
foreach_iter(exec_list_iterator, it, values->subexpressions) {
s_expression *expr = (s_expression *) it.get();
s_list *elt = SX_AS_LIST(expr);
if (elt == NULL) {
ir_read_error(st, expr, "expected (constant ...) array element");
return NULL;
}
ir_constant *ir_elt = read_constant(st, elt);
if (ir_elt == NULL)
return NULL;
elements.push_tail(ir_elt);
}
return new(ctx) ir_constant(type, &elements);
}
const glsl_type *const base_type = type->get_base_type(); const glsl_type *const base_type = type->get_base_type();
ir_constant_data data; ir_constant_data data;