From ae3375987fe9968f822442a0ce49b97f5f0a4070 Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Thu, 14 Feb 2008 03:08:48 -0500 Subject: [PATCH] rename 'argument' to 'load' because that's what it does --- src/mesa/pipe/llvm/storagesoa.cpp | 4 ++-- src/mesa/pipe/llvm/storagesoa.h | 4 ++-- src/mesa/pipe/llvm/tgsitollvm.cpp | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mesa/pipe/llvm/storagesoa.cpp b/src/mesa/pipe/llvm/storagesoa.cpp index 75e7a36bc24..408b29417ce 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 StorageSoa::argument(Argument type, int idx, int swizzle, - llvm::Value *indIdx ) +std::vector StorageSoa::load(Argument type, int idx, int swizzle, + llvm::Value *indIdx ) { std::vector val(4); switch(type) { diff --git a/src/mesa/pipe/llvm/storagesoa.h b/src/mesa/pipe/llvm/storagesoa.h index 8880bf5ec67..d59168f07da 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 argument(Argument type, int idx, int swizzle, - llvm::Value *indIdx =0); + std::vector load(Argument type, int idx, int swizzle, + llvm::Value *indIdx =0); void store(Argument type, int idx, const std::vector &val, int mask); diff --git a/src/mesa/pipe/llvm/tgsitollvm.cpp b/src/mesa/pipe/llvm/tgsitollvm.cpp index 287a86c60cb..0c2c3a9a0ac 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; -- 2.30.2