diff options
| author | Brian Paul <[email protected]> | 2008-08-16 09:30:14 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-08-16 09:30:14 -0600 |
| commit | 1f4997c2aaf424c8a12cc6fdb1dd994f66074a1d (patch) | |
| tree | de14cfe88863d678bc618b54a7569f831fd7f590 /src/mesa/shader/slang/slang_ir.h | |
| parent | 1b39b92e6d7d3a7e6c39b985ffff32a79a510333 (diff) | |
mesa: import latest GLSL code from gallium-0.1 branch
Diffstat (limited to 'src/mesa/shader/slang/slang_ir.h')
| -rw-r--r-- | src/mesa/shader/slang/slang_ir.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/shader/slang/slang_ir.h b/src/mesa/shader/slang/slang_ir.h index 61ff649e5cc..f64f9a93b78 100644 --- a/src/mesa/shader/slang/slang_ir.h +++ b/src/mesa/shader/slang/slang_ir.h @@ -33,10 +33,10 @@ #define SLANG_IR_H -#include "imports.h" +#include "main/imports.h" #include "slang_compile.h" #include "slang_label.h" -#include "mtypes.h" +#include "main/mtypes.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, |