From 6e833d4d093038ccd0a44f0d7baa33ea37320abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 18 Apr 2013 09:55:35 +0100 Subject: [PATCH] gallivm: Drop pos arg from lp_build_tgsi_soa. Never used. Reviewed-by: Roland Scheidegger --- src/gallium/auxiliary/draw/draw_llvm.c | 2 -- src/gallium/auxiliary/gallivm/lp_bld_tgsi.h | 2 -- src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 2 -- src/gallium/drivers/llvmpipe/lp_state_fs.c | 4 ++-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 8e3ea8897d0..e0c07057441 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -593,7 +593,6 @@ generate_vs(struct draw_llvm_variant *variant, NULL /*struct lp_build_mask_context *mask*/, consts_ptr, system_values, - NULL /*pos*/, inputs, outputs, sampler, @@ -2023,7 +2022,6 @@ draw_gs_llvm_generate(struct draw_llvm *llvm, &mask, consts_ptr, &system_values, - NULL /*pos*/, NULL, outputs, sampler, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h index 78a1f0ea4ee..175b6a9f0f6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h @@ -222,7 +222,6 @@ lp_build_tgsi_soa(struct gallivm_state *gallivm, struct lp_build_mask_context *mask, LLVMValueRef consts_ptr, const struct lp_bld_tgsi_system_values *system_values, - const LLVMValueRef *pos, const LLVMValueRef (*inputs)[4], LLVMValueRef (*outputs)[4], struct lp_build_sampler_soa *sampler, @@ -400,7 +399,6 @@ struct lp_build_tgsi_soa_context LLVMValueRef max_output_vertices_vec; LLVMValueRef consts_ptr; - const LLVMValueRef *pos; const LLVMValueRef (*inputs)[TGSI_NUM_CHANNELS]; LLVMValueRef (*outputs)[TGSI_NUM_CHANNELS]; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index ea7dec727d2..af1b8aa76ae 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -2742,7 +2742,6 @@ lp_build_tgsi_soa(struct gallivm_state *gallivm, struct lp_build_mask_context *mask, LLVMValueRef consts_ptr, const struct lp_bld_tgsi_system_values *system_values, - const LLVMValueRef *pos, const LLVMValueRef (*inputs)[TGSI_NUM_CHANNELS], LLVMValueRef (*outputs)[TGSI_NUM_CHANNELS], struct lp_build_sampler_soa *sampler, @@ -2766,7 +2765,6 @@ lp_build_tgsi_soa(struct gallivm_state *gallivm, lp_build_context_init(&bld.bld_base.int_bld, gallivm, lp_int_type(type)); lp_build_context_init(&bld.elem_bld, gallivm, lp_elem_type(type)); bld.mask = mask; - bld.pos = pos; bld.inputs = inputs; bld.outputs = outputs; bld.consts_ptr = consts_ptr; diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index ea41bd64720..cdf246fdcdb 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -353,7 +353,7 @@ generate_fs(struct gallivm_state *gallivm, /* Build the actual shader */ lp_build_tgsi_soa(gallivm, tokens, type, &mask, consts_ptr, &system_values, - interp->pos, interp->inputs, + interp->inputs, outputs, sampler, &shader->info.base, NULL); /* Alpha test */ @@ -606,7 +606,7 @@ generate_fs_loop(struct gallivm_state *gallivm, /* Build the actual shader */ lp_build_tgsi_soa(gallivm, tokens, type, &mask, consts_ptr, &system_values, - interp->pos, interp->inputs, + interp->inputs, outputs, sampler, &shader->info.base, NULL); /* Alpha test */