Mesa (master): cell: fix compilation

[Brian Paul]

Module: Mesa
Branch: master
Commit: a192da37ed2b8e7c9cc1525687233ad59611a3f8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a192da37ed2b8e7c9cc1525687233ad59611a3f8

Author: Marc Dietrich <marvin24 at gmx.de>
Date:   Sun Aug 30 09:24:27 2009 -0600

cell: fix compilation

---

 src/gallium/drivers/cell/common.h          |    2 +-
 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 1f6860d..d5f5c7b 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 58a8b5d..312621f 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 */