KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: assemble main() after all other functions 

Before, main() had to come after any functions it called.
This commit is contained in:
Brian Paul 2008-07-14 15:59:44 -06:00
parent c62cb6be6c
commit f214a848ab
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mesa/shader/slang/slang_compile.c
View File

@ -1788,20 +1788,6 @@ parse_function(slang_parse_ctx * C, slang_output_ctx * O, int definition,
*parsed_func_ret = found_func;
}
/* assemble the parsed function */
{
slang_assemble_ctx A;
A.atoms = C->atoms;
A.space.funcs = O->funs;
A.space.structs = O->structs;
A.space.vars = O->vars;
A.program = O->program;
A.vartable = O->vartable;
A.log = C->L;
_slang_codegen_function(&A, *parsed_func_ret);
}
return GL_TRUE;
}
@ -1844,6 +1830,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
slang_output_ctx o;
GLboolean success;
GLuint maxRegs;
slang_function *mainFunc = NULL;
if (unit->type == SLANG_UNIT_FRAGMENT_BUILTIN ||
unit->type == SLANG_UNIT_FRAGMENT_SHADER) {
@ -1871,6 +1858,11 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
{
slang_function *func;
success = parse_function(C, &o, 1, &func);
if (success &&
_mesa_strcmp((char *) func->header.a_name, "main") == 0) {
/* found main() */
mainFunc = func;
}
}
break;
case EXTERNAL_DECLARATION:
@ -1888,6 +1880,22 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
}
C->I++;
if (mainFunc) {
/* assemble (generate code) for main() */
slang_assemble_ctx A;
A.atoms = C->atoms;
A.space.funcs = o.funs;
A.space.structs = o.structs;
A.space.vars = o.vars;
A.program = o.program;
A.vartable = o.vartable;
A.log = C->L;
_slang_codegen_function(&A, mainFunc);
}
_slang_pop_var_table(o.vartable);
_slang_delete_var_table(o.vartable);