diff options
| author | Marc Dietrich <marvin24@gmx.de> | 2009-08-30 09:24:27 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-30 09:24:27 -0600 |
| commit | a192da37ed2b8e7c9cc1525687233ad59611a3f8 (patch) | |
| tree | e96eeee480294c7b5fa16e9b2fe3f7ce1bb2eada | |
| parent | d6b8664e3cd37c081cb1dd3d6cd5ffdac1813dac (diff) | |
cell: fix compilation
| -rw-r--r-- | src/gallium/drivers/cell/common.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/cell/ppu/cell_gen_fp.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/cell/common.h b/src/gallium/drivers/cell/common.h index 1f6860da11..d5f5c7bbba 100644 --- a/src/gallium/drivers/cell/common.h +++ b/src/gallium/drivers/cell/common.h @@ -327,7 +327,7 @@ struct cell_command_sampler opcode_t opcode; /**< CELL_CMD_STATE_SAMPLER */ uint unit; struct pipe_sampler_state state; - uint32_t pad_[1]; + uint32_t pad_[2]; }; diff --git a/src/gallium/drivers/cell/ppu/cell_gen_fp.c b/src/gallium/drivers/cell/ppu/cell_gen_fp.c index 58a8b5d0b0..312621fd53 100644 --- a/src/gallium/drivers/cell/ppu/cell_gen_fp.c +++ b/src/gallium/drivers/cell/ppu/cell_gen_fp.c @@ -1767,7 +1767,7 @@ emit_instruction(struct codegen *gen, case TGSI_OPCODE_MAD: return emit_MAD(gen, inst); case TGSI_OPCODE_LERP: - return emit_LERP(gen, inst); + return emit_LRP(gen, inst); case TGSI_OPCODE_DP3: return emit_DP3(gen, inst); case TGSI_OPCODE_DP4: @@ -1810,9 +1810,9 @@ emit_instruction(struct codegen *gen, return emit_function_call(gen, inst, "spu_sin", 1, TRUE); case TGSI_OPCODE_POW: return emit_function_call(gen, inst, "spu_pow", 2, TRUE); - case TGSI_OPCODE_EXPBASE2: + case TGSI_OPCODE_EX2: return emit_function_call(gen, inst, "spu_exp2", 1, TRUE); - case TGSI_OPCODE_LOGBASE2: + case TGSI_OPCODE_LG2: return emit_function_call(gen, inst, "spu_log2", 1, TRUE); case TGSI_OPCODE_TEX: /* fall-through for now */ |