Mesa (gallium-0.2): mesa: when emitting an address load instruction, for

[Alan Hourihane]

Module: Mesa
Branch: gallium-0.2
Commit: 5bc8ebb12be99ac769a0f2ad1f77a16ebb2bf41f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bc8ebb12be99ac769a0f2ad1f77a16ebb2bf41f

Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Mon Oct 13 12:30:40 2008 +0100

mesa: when emitting an address load instruction, for
      indexed elements ensure we write to a single register.

---

 src/mesa/shader/slang/slang_emit.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 9e8daa1..f3c3fa6 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -1579,13 +1579,17 @@ emit_array_element(slang_emit_info *emitInfo, slang_ir_node *n)
    else {
       /* Variable array index */
       struct prog_instruction *inst;
+      slang_ir_storage dstStore = *n->Store;
 
       /* do codegen for array index expression */
       emit(emitInfo, n->Children[1]);
 
       inst = new_instruction(emitInfo, OPCODE_ARL);
 
-      storage_to_dst_reg(&inst->DstReg, n->Store, n->Writemask);
+      if (dstStore.Size > 4)
+         dstStore.Size = 4; /* only emit one instruction */
+
+      storage_to_dst_reg(&inst->DstReg, &dstStore, n->Writemask);
       storage_to_src_reg(&inst->SrcReg[0], n->Children[1]->Store);
 
       inst->DstReg.File = PROGRAM_ADDRESS;