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

glsl: Remove the ability to read text IR with conditional assignments

Browse Source 
Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14573>
This commit is contained in:
Ian Romanick
2022-01-14 17:55:21 -08:00
committed by Marge Bot
parent 710adf2e60
commit 50a0d0d875
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/glsl/ir_reader.cpp
View File

@@ -585,18 +585,18 @@ ir_reader::read_assignment(s_expression *expr)
s_pattern pat4[] = { "assign", mask_list, lhs_expr, rhs_expr };
s_pattern pat5[] = { "assign", cond_expr, mask_list, lhs_expr, rhs_expr };
if (!MATCH(expr, pat4) && !MATCH(expr, pat5)) {
ir_read_error(expr, "expected (assign [<condition>] (<write mask>) "
"<lhs> <rhs>)");
ir_read_error(expr, "expected (assign (<write mask>) <lhs> <rhs>)");
return NULL;
}
ir_rvalue *condition = NULL;
if (cond_expr != NULL) {
condition = read_rvalue(cond_expr);
if (condition == NULL) {
ir_read_error(NULL, "when reading condition of assignment");
return NULL;
}
ir_rvalue *condition = read_rvalue(cond_expr);
if (condition == NULL)
ir_read_error(NULL, "when reading condition of assignment");
else
ir_read_error(expr, "conditional assignemnts are deprecated");
return NULL;
}
unsigned mask = 0;
@@ -643,7 +643,7 @@ ir_reader::read_assignment(s_expression *expr)
return NULL;
}
return new(mem_ctx) ir_assignment(lhs, rhs, condition, mask);
return new(mem_ctx) ir_assignment(lhs, rhs, mask);
}
ir_call *