[Mesa-dev] [PATCH 1/3] gallivm: Drop pos arg from lp_build_tgsi_soa.

jfonseca at vmware.com jfonseca at vmware.com
Thu Apr 18 03:40:23 PDT 2013


From: José Fonseca <jfonseca at vmware.com>

Never used.
---
 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 8e3ea88..e0c0705 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 78a1f0e..175b6a9 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 ea7dec7..af1b8aa 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 ea41bd6..cdf246f 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 */
-- 
1.7.9.5



More information about the mesa-dev mailing list