rename 'argument' to 'load' because that's what it does

diff --git a/src/mesa/pipe/llvm/storagesoa.cpp b/src/mesa/pipe/llvm/storagesoa.cpp
index 75e7a36bc24ea3ce46c7defd6c2355cd1ab538a8..408b29417cefb07348b1d1dd5dbc328c2a0f0cb7 100644 (file)
--- a/src/mesa/pipe/llvm/storagesoa.cpp
+++ b/src/mesa/pipe/llvm/storagesoa.cpp
@@ -248,8 +248,8 @@ llvm::Value * StorageSoa::createConstGlobalVector(float *vec)
    return immediate;
 }
 
-std::vector<llvm::Value*> StorageSoa::argument(Argument type, int idx, int swizzle,
-                                               llvm::Value *indIdx )
+std::vector<llvm::Value*> StorageSoa::load(Argument type, int idx, int swizzle,
+                                           llvm::Value *indIdx )
 {
    std::vector<llvm::Value*> val(4);
    switch(type) {

diff --git a/src/mesa/pipe/llvm/storagesoa.h b/src/mesa/pipe/llvm/storagesoa.h
index 8880bf5ec6746d1c5b019404c681d0375a28d6c0..d59168f07dab13acb060299cbee9e60ac180143c 100644 (file)
--- a/src/mesa/pipe/llvm/storagesoa.h
+++ b/src/mesa/pipe/llvm/storagesoa.h
@@ -60,8 +60,8 @@ public:
               llvm::Value *temps);
 
 
-   std::vector<llvm::Value*> argument(Argument type, int idx, int swizzle, 
-                                      llvm::Value *indIdx =0);
+   std::vector<llvm::Value*> load(Argument type, int idx, int swizzle, 
+                                  llvm::Value *indIdx =0);
    void store(Argument type, int idx, const std::vector<llvm::Value*> &val,
               int mask);
 

diff --git a/src/mesa/pipe/llvm/tgsitollvm.cpp b/src/mesa/pipe/llvm/tgsitollvm.cpp
index 287a86c60cb61011adc0a5383330623c9b7f26d0..0c2c3a9a0acd7fcbba01c1e587250e5206db4555 100644 (file)
--- a/src/mesa/pipe/llvm/tgsitollvm.cpp
+++ b/src/mesa/pipe/llvm/tgsitollvm.cpp
@@ -706,20 +706,20 @@ translate_instructionir(llvm::Module *module,
          indIdx = storage->extractIndex(indIdx);
       }
       if (src->SrcRegister.File == TGSI_FILE_CONSTANT) {
-         val = storage->argument(StorageSoa::Const,
-                                 src->SrcRegister.Index, swizzle, indIdx);
+         val = storage->load(StorageSoa::Const,
+                             src->SrcRegister.Index, swizzle, indIdx);
       } else if (src->SrcRegister.File == TGSI_FILE_INPUT) {
-         val = storage->argument(StorageSoa::Input,
-                                 src->SrcRegister.Index, swizzle, indIdx);
+         val = storage->load(StorageSoa::Input,
+                             src->SrcRegister.Index, swizzle, indIdx);
       } else if (src->SrcRegister.File == TGSI_FILE_TEMPORARY) {
-         val = storage->argument(StorageSoa::Temp,
-                                 src->SrcRegister.Index, swizzle);
+         val = storage->load(StorageSoa::Temp,
+                             src->SrcRegister.Index, swizzle);
       } else if (src->SrcRegister.File == TGSI_FILE_OUTPUT) {
-         val = storage->argument(StorageSoa::Output,
-                                 src->SrcRegister.Index, swizzle, indIdx);
+         val = storage->load(StorageSoa::Output,
+                             src->SrcRegister.Index, swizzle, indIdx);
       } else if (src->SrcRegister.File == TGSI_FILE_IMMEDIATE) {
-         val = storage->argument(StorageSoa::Immediate,
-                                 src->SrcRegister.Index, swizzle);
+         val = storage->load(StorageSoa::Immediate,
+                             src->SrcRegister.Index, swizzle);
       } else {
          fprintf(stderr, "ERROR: not supported llvm source %d\n", src->SrcRegister.File);
          return;