diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-26 17:07:07 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-26 17:07:07 -0600 |
| commit | a18e209edb5348eb167e9d7184597031bbbbe622 (patch) | |
| tree | 60fcd288119f335cccdc2f15981c9b315d332e64 /src/mesa/shader/slang/slang_compile.c | |
| parent | 4fdc6ad41b843109febbe9596dde87f676a8b0e9 (diff) | |
| parent | 418987ff05f892d3c33ed4ddbe856c496b05ea14 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/shader/slang/slang_compile.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_compile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c index d7ad879e97..c1b97c7cb7 100644 --- a/src/mesa/shader/slang/slang_compile.c +++ b/src/mesa/shader/slang/slang_compile.c @@ -1953,6 +1953,7 @@ static int parse_init_declarator(slang_parse_ctx * C, slang_output_ctx * O, const slang_fully_specified_type * type) { + GET_CURRENT_CONTEXT(ctx); /* a hack */ slang_variable *var; slang_atom a_name; @@ -2066,6 +2067,7 @@ parse_init_declarator(slang_parse_ctx * C, slang_output_ctx * O, A.vartable = O->vartable; A.log = C->L; A.curFuncEndLabel = NULL; + A.EmitContReturn = ctx->Shader.EmitContReturn; if (!_slang_codegen_global_variable(&A, var, C->type)) RETURN0; } @@ -2430,6 +2432,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit, A.program = o.program; A.pragmas = &shader->Pragmas; A.vartable = o.vartable; + A.EmitContReturn = ctx->Shader.EmitContReturn; A.log = C->L; /* main() takes no parameters */ |