diff options
author | Brian <brian@yutani.localnet.net> | 2007-02-22 16:02:08 -0700 |
---|---|---|
committer | Brian <brian@yutani.localnet.net> | 2007-02-22 16:02:08 -0700 |
commit | 7c86e10193491a36433104a5f1f0f4cf37a6333f (patch) | |
tree | 5df9b74b8de5b336038afec86beff445ca0566e5 /src/mesa/shader/slang | |
parent | 740a8b0b66f0e00807f064e3105fd6b045e5a2d0 (diff) |
emit high-level IF/ELSE/ENDIF for vertex progs now
Diffstat (limited to 'src/mesa/shader/slang')
-rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index d3360b7945..51c8f27c80 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -1439,6 +1439,7 @@ _slang_gen_for(slang_assemble_ctx * A, const slang_operation *oper) } +#if 0 /** * Generate IR tree for an if/then/else conditional using BRAnch instructions. */ @@ -1487,6 +1488,7 @@ _slang_gen_if(slang_assemble_ctx * A, const slang_operation *oper) return tree; } +#endif /** @@ -2443,13 +2445,7 @@ _slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper) case SLANG_OPER_IDENTIFIER: return _slang_gen_variable(A, oper); case SLANG_OPER_IF: - if (A->program->Target == GL_FRAGMENT_PROGRAM_ARB) { - return _slang_gen_hl_if(A, oper); - } - else { - /* XXX update tnl executor */ - return _slang_gen_if(A, oper); - } + return _slang_gen_hl_if(A, oper); case SLANG_OPER_FIELD: return _slang_gen_field(A, oper); case SLANG_OPER_SUBSCRIPT: |