diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-07 11:26:47 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-07 11:26:47 -0700 |
| commit | 5b5a80d011d143f1bbd9be39dc4ca6a0af4bad7c (patch) | |
| tree | afd256ae5d4dadda81c54547e08ac5de50c04b7d /src/mesa/shader/slang/slang_codegen.c | |
| parent | ab673c852724e81365ab9d979881da7464131854 (diff) | |
s/equal/EQUAL/, fix bugs in logical or/and code.
Diffstat (limited to 'src/mesa/shader/slang/slang_codegen.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 5c2ee3c438..d1e3544b54 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -1650,8 +1650,8 @@ _slang_gen_logical_and(slang_assemble_ctx *A, slang_operation *oper) slang_operation_copy(&select->children[0], &oper->children[0]); slang_operation_copy(&select->children[1], &oper->children[1]); select->children[2].type = SLANG_OPER_LITERAL_BOOL; - ASSIGN_4V(select->children[2].literal, 0, 0, 0, 0); - select->children[2].literal_size = 2; + ASSIGN_4V(select->children[2].literal, 0, 0, 0, 0); /* false */ + select->children[2].literal_size = 1; n = _slang_gen_select(A, select); @@ -1680,9 +1680,9 @@ _slang_gen_logical_or(slang_assemble_ctx *A, slang_operation *oper) slang_operation_copy(&select->children[0], &oper->children[0]); select->children[1].type = SLANG_OPER_LITERAL_BOOL; - ASSIGN_4V(select->children[2].literal, 1, 1, 1, 1); + ASSIGN_4V(select->children[1].literal, 1, 1, 1, 1); /* true */ + select->children[1].literal_size = 1; slang_operation_copy(&select->children[2], &oper->children[1]); - select->children[2].literal_size = 2; n = _slang_gen_select(A, select); @@ -2281,11 +2281,11 @@ _slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper) return new_node2(IR_SGT, _slang_gen_operation(A, &oper->children[1]), _slang_gen_operation(A, &oper->children[0])); - case SLANG_OPER_GREATERequal: + case SLANG_OPER_GREATEREQUAL: return new_node2(IR_SGE, _slang_gen_operation(A, &oper->children[0]), _slang_gen_operation(A, &oper->children[1])); - case SLANG_OPER_LESSequal: + case SLANG_OPER_LESSEQUAL: /* child[0] <= child[1] ----> child[1] >= child[0] */ return new_node2(IR_SGE, _slang_gen_operation(A, &oper->children[1]), |