diff options
| author | Nicolai Hähnle <[email protected]> | 2017-09-13 14:38:17 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-09-18 11:25:18 +0200 |
| commit | 6772452e4c75dd3d6880333fc98fd9035dd42717 (patch) | |
| tree | 95c18457b3cbe38d46adc9e06c0e21c061e8cdaa /src/amd/common | |
| parent | 3db86d86ed8484d04c42453001d8704c3cd5d446 (diff) | |
amd/common: remove has_ds_bpermute argument from ac_build_ddxy
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/amd/common')
| -rw-r--r-- | src/amd/common/ac_llvm_build.c | 3 | ||||
| -rw-r--r-- | src/amd/common/ac_llvm_build.h | 1 | ||||
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c index 4077bd81bbc..6c010e8c3a6 100644 --- a/src/amd/common/ac_llvm_build.c +++ b/src/amd/common/ac_llvm_build.c @@ -972,7 +972,6 @@ ac_get_thread_id(struct ac_llvm_context *ctx) */ LLVMValueRef ac_build_ddxy(struct ac_llvm_context *ctx, - bool has_ds_bpermute, uint32_t mask, int idx, LLVMValueRef val) @@ -980,7 +979,7 @@ ac_build_ddxy(struct ac_llvm_context *ctx, LLVMValueRef tl, trbl, args[2]; LLVMValueRef result; - if (has_ds_bpermute) { + if (ctx->chip_class >= VI) { LLVMValueRef thread_id, tl_tid, trbl_tid; thread_id = ac_get_thread_id(ctx); diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h index b6434893cfa..3f93551330c 100644 --- a/src/amd/common/ac_llvm_build.h +++ b/src/amd/common/ac_llvm_build.h @@ -194,7 +194,6 @@ ac_get_thread_id(struct ac_llvm_context *ctx); LLVMValueRef ac_build_ddxy(struct ac_llvm_context *ctx, - bool has_ds_bpermute, uint32_t mask, int idx, LLVMValueRef val); diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 870620e7870..217d1e67ae2 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -1414,7 +1414,6 @@ static LLVMValueRef emit_ddxy(struct ac_nir_context *ctx, unsigned mask; int idx; LLVMValueRef result; - bool has_ds_bpermute = ctx->abi->chip_class >= VI; if (op == nir_op_fddx_fine || op == nir_op_fddx) mask = AC_TID_MASK_LEFT; @@ -1431,9 +1430,7 @@ static LLVMValueRef emit_ddxy(struct ac_nir_context *ctx, else idx = 2; - result = ac_build_ddxy(&ctx->ac, has_ds_bpermute, - mask, idx, - src0); + result = ac_build_ddxy(&ctx->ac, mask, idx, src0); return result; } |