fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Make ir_reader able to read plain (return) statements.

Browse source 
Previously ir_reader was only able to handle return of non-void.

This patch is necessary in order to allow optimization passes to be
tested in isolation.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Paul Berry 2011-06-29 15:30:40 -07:00
parent 5fb79fc69f
commit f4830be938
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/glsl/ir_reader.cpp
View file

@ -482,19 +482,21 @@ ir_reader::read_return(s_expression *expr)
{ {
s_expression *s_retval; s_expression *s_retval;
s_pattern pat[] = { "return", s_retval}; s_pattern return_value_pat[] = { "return", s_retval};
if (!MATCH(expr, pat)) { s_pattern return_void_pat[] = { "return" };
ir_read_error(expr, "expected (return <rvalue>)"); if (MATCH(expr, return_value_pat)) {
ir_rvalue *retval = read_rvalue(s_retval);
if (retval == NULL) {
ir_read_error(NULL, "when reading return value");
return NULL;
}
return new(mem_ctx) ir_return(retval);
} else if (MATCH(expr, return_void_pat)) {
return new(mem_ctx) ir_return;
} else {
ir_read_error(expr, "expected (return <rvalue>) or (return)");
return NULL; return NULL;
} }
ir_rvalue *retval = read_rvalue(s_retval);
if (retval == NULL) {
ir_read_error(NULL, "when reading return value");
return NULL;
}
return new(mem_ctx) ir_return(retval);
} }