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

ir_reader: Drop support for reading the old assignment format.

Browse Source
This commit is contained in:
Kenneth Graunke
2010-09-03 16:14:40 -07:00
parent a878107d6c
commit b758de16e3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glsl/ir_reader.cpp
View File

@@ -581,8 +581,7 @@ static ir_assignment *
read_assignment(_mesa_glsl_parse_state *st, s_list *list) read_assignment(_mesa_glsl_parse_state *st, s_list *list)
{ {
void *ctx = st; void *ctx = st;
const unsigned list_length = list->length(); if (list->length() != 5) {
if (list_length < 4 || list_length > 5) {
ir_read_error(st, list, "expected (assign <condition> (<write mask>) " ir_read_error(st, list, "expected (assign <condition> (<write mask>) "
"<lhs> <rhs>)"); "<lhs> <rhs>)");
return NULL; return NULL;
@@ -590,8 +589,7 @@ read_assignment(_mesa_glsl_parse_state *st, s_list *list)
s_expression *cond_expr = (s_expression*) list->subexpressions.head->next; s_expression *cond_expr = (s_expression*) list->subexpressions.head->next;
s_list *mask_list = SX_AS_LIST(cond_expr->next); s_list *mask_list = SX_AS_LIST(cond_expr->next);
s_expression *lhs_expr = (s_expression*) s_expression *lhs_expr = (s_expression*) cond_expr->next->next;
(list_length == 4 ? cond_expr->next : cond_expr->next->next);
s_expression *rhs_expr = (s_expression*) lhs_expr->next; s_expression *rhs_expr = (s_expression*) lhs_expr->next;
ir_rvalue *condition = read_rvalue(st, cond_expr); ir_rvalue *condition = read_rvalue(st, cond_expr);
@@ -600,13 +598,13 @@ read_assignment(_mesa_glsl_parse_state *st, s_list *list)
return NULL; return NULL;
} }
if (list_length == 5 && mask_list == NULL || mask_list->length() > 1) { if (mask_list == NULL || mask_list->length() > 1) {
ir_read_error(st, mask_list, "expected () or (<write mask>)"); ir_read_error(st, mask_list, "expected () or (<write mask>)");
return NULL; return NULL;
} }
unsigned mask = 0; unsigned mask = 0;
if (list_length == 5 && mask_list->length() == 1) { if (mask_list->length() == 1) {
s_symbol *mask_symbol = SX_AS_SYMBOL(mask_list->subexpressions.head); s_symbol *mask_symbol = SX_AS_SYMBOL(mask_list->subexpressions.head);
if (mask_symbol == NULL) { if (mask_symbol == NULL) {
ir_read_error(st, list, "expected a write mask; found non-symbol"); ir_read_error(st, list, "expected a write mask; found non-symbol");