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

Minor cleanups in ast_function_definition::hir

Browse Source
This commit is contained in:
Ian Romanick
2010-03-31 17:39:10 -07:00
parent 00aa173c9c
commit 25711a85c2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ast_to_hir.cpp
View File

@@ -1513,7 +1513,7 @@ ast_function_definition::hir(exec_list *instructions,
/* Verify the return type of main() */ /* Verify the return type of main() */
if (strcmp(name, "main") == 0) { if (strcmp(name, "main") == 0) {
if (return_type != glsl_type::get_instance(GLSL_TYPE_VOID, 0, 0)) { if (! return_type->is_void()) {
YYLTYPE loc = this->get_location(); YYLTYPE loc = this->get_location();
_mesa_glsl_error(& loc, state, "main() must return void"); _mesa_glsl_error(& loc, state, "main() must return void");
@@ -1551,7 +1551,6 @@ ast_function_definition::hir(exec_list *instructions,
ast_function_parameters_to_hir(& this->prototype->parameters, ast_function_parameters_to_hir(& this->prototype->parameters,
& signature->parameters, & signature->parameters,
state); state);
/* FINISHME: Set signature->return_type */
label = new ir_label(name); label = new ir_label(name);
if (signature->definition == NULL) { if (signature->definition == NULL) {
@@ -1566,9 +1565,9 @@ ast_function_definition::hir(exec_list *instructions,
*/ */
state->symbols->push_scope(); state->symbols->push_scope();
foreach_iter(exec_list_iterator, iter, parameters) { foreach_iter(exec_list_iterator, iter, parameters) {
ir_variable *const var = (ir_variable *) iter.get(); ir_variable *const var = ((ir_instruction *) iter.get())->as_variable();
assert(((ir_instruction *) var)->as_variable() != NULL); assert(var != NULL);
iter.remove(); iter.remove();
instructions->push_tail(var); instructions->push_tail(var);