Rewrite argument passing to prepare for handling of the kil instruction.

Pass the inputs/outputs pointer in the structure instead of infinitely
expanding arguments to the functions.

1 files changed, 4 insertions, 14 deletions

diff --git a/src/mesa/pipe/llvm/gallivm.cpp b/src/mesa/pipe/llvm/gallivm.cpp
index a60440022a..65c95074fd 100644
--- a/src/mesa/pipe/llvm/gallivm.cpp
+++ b/src/mesa/pipe/llvm/gallivm.cpp
@@ -485,11 +485,7 @@ translate_instruction(llvm::Module *module,
    case TGSI_OPCODE_BRA:
       break;
    case TGSI_OPCODE_CAL: {
-      instr->cal(inst->InstructionExtLabel.Label,
-                 storage->outputPtr(),
-                 storage->inputPtr(),
-                 storage->constPtr(),
-                 storage->tempPtr());
+      instr->cal(inst->InstructionExtLabel.Label, storage->inputPtr());
       return;
    }
       break;
@@ -740,14 +736,8 @@ tgsi_to_llvm(struct gallivm_prog *prog, const struct tgsi_token *tokens)
    shader->setName(func_name.c_str());
 
    Function::arg_iterator args = shader->arg_begin();
-   Value *ptr_OUT = args++;
-   ptr_OUT->setName("OUT");
-   Value *ptr_IN = args++;
-   ptr_IN->setName("IN");
-   Value *ptr_CONST = args++;
-   ptr_CONST->setName("CONST");
-   Value *ptr_TEMPS = args++;
-   ptr_TEMPS->setName("TEMPS");
+   Value *ptr_INPUT = args++;
+   ptr_INPUT->setName("input");
 
    BasicBlock *label_entry = new BasicBlock("entry", shader, 0);
 
@@ -755,7 +745,7 @@ tgsi_to_llvm(struct gallivm_prog *prog, const struct tgsi_token *tokens)
 
    fi = tgsi_default_full_instruction();
    fd = tgsi_default_full_declaration();
-   Storage storage(label_entry, ptr_OUT, ptr_IN, ptr_CONST, ptr_TEMPS);
+   Storage storage(label_entry, ptr_INPUT);
    Instructions instr(mod, shader, label_entry, &storage);
    while(!tgsi_parse_end_of_tokens(&parse)) {
       tgsi_parse_token(&parse);