summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2008-02-14 03:08:48 -0500
committerZack Rusin <zack@tungstengraphics.com>2008-02-15 01:17:17 -0500
commitae3375987fe9968f822442a0ce49b97f5f0a4070 (patch)
tree9c2693c530bb849f038c22318dc27377bf895a93
parentd0364584bea6c57bb3ac8d616e677fb52b97ea98 (diff)
rename 'argument' to 'load' because that's what it does
-rw-r--r--src/mesa/pipe/llvm/storagesoa.cpp4
-rw-r--r--src/mesa/pipe/llvm/storagesoa.h4
-rw-r--r--src/mesa/pipe/llvm/tgsitollvm.cpp20
3 files changed, 14 insertions, 14 deletions
diff --git a/src/mesa/pipe/llvm/storagesoa.cpp b/src/mesa/pipe/llvm/storagesoa.cpp
index 75e7a36bc2..408b29417c 100644
--- 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 8880bf5ec6..d59168f07d 100644
--- 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 287a86c60c..0c2c3a9a0a 100644
--- 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;