diff options
| author | Ben Skeggs <skeggsb@localhost.localdomain> | 2008-08-07 11:19:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@localhost.localdomain> | 2008-08-07 11:19:15 +1000 |
| commit | 4b1c508f49a070f113929393423d6704f1ff18b6 (patch) | |
| tree | 76803b434b75b438c44829ed55e1a19b208dde01 /src/mesa/shader/slang/slang_ir.h | |
| parent | 7fde9febd6f212494730ebef916fe25c95d30be9 (diff) | |
| parent | be66a8f43172327e3cdde27281e40377cacbb121 (diff) | |
| download | external_mesa3d-4b1c508f49a070f113929393423d6704f1ff18b6.zip external_mesa3d-4b1c508f49a070f113929393423d6704f1ff18b6.tar.gz external_mesa3d-4b1c508f49a070f113929393423d6704f1ff18b6.tar.bz2 | |
Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/shader/slang/slang_ir.h')
| -rw-r--r-- | src/mesa/shader/slang/slang_ir.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/slang/slang_ir.h b/src/mesa/shader/slang/slang_ir.h index e4697ba..f64f9a9 100644 --- a/src/mesa/shader/slang/slang_ir.h +++ b/src/mesa/shader/slang/slang_ir.h @@ -70,14 +70,14 @@ typedef enum /* n->Parent = ptr to parent IR_LOOP Node */ IR_BREAK, /* break loop */ - IR_BREAK_IF_TRUE, + IR_BREAK_IF_TRUE, /**< Children[0] = the condition expression */ IR_CONT_IF_TRUE, - /* Children[0] = the condition expression */ - IR_MOVE, + IR_COPY, /**< assignment/copy */ + IR_MOVE, /**< assembly MOV instruction */ /* vector ops: */ - IR_ADD, + IR_ADD, /**< assembly ADD instruction */ IR_SUB, IR_MUL, IR_DIV, |