Mesa (master): llvmpipe: remove unused arg from jit_setup_tri function

Keith Whitwell keithw at kemper.freedesktop.org
Mon Oct 18 02:24:06 UTC 2010


Module: Mesa
Branch: master
Commit: 9da17fed2e7645a401a378ae690eb23513948e18
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9da17fed2e7645a401a378ae690eb23513948e18

Author: Keith Whitwell <keithw at vmware.com>
Date:   Sun Oct 17 19:23:40 2010 -0700

llvmpipe: remove unused arg from jit_setup_tri function

---

 src/gallium/drivers/llvmpipe/lp_setup_tri.c   |    3 +--
 src/gallium/drivers/llvmpipe/lp_state_setup.c |    3 +--
 src/gallium/drivers/llvmpipe/lp_state_setup.h |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_setup_tri.c b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
index 03036cd..4ab0b72 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
@@ -323,8 +323,7 @@ do_triangle_ccw(struct lp_setup_context *setup,
 				       frontfacing,
 				       GET_A0(&tri->inputs),
 				       GET_DADX(&tri->inputs),
-				       GET_DADY(&tri->inputs),
-				       &setup->setup.variant->key );
+				       GET_DADY(&tri->inputs) );
 
    tri->inputs.frontfacing = frontfacing;
    tri->inputs.disable = FALSE;
diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.c b/src/gallium/drivers/llvmpipe/lp_state_setup.c
index a8dee28..2c8b8b9 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_setup.c
@@ -485,7 +485,7 @@ generate_setup_variant(struct llvmpipe_screen *screen,
    char func_name[256];
    LLVMTypeRef vec4f_type;
    LLVMTypeRef func_type;
-   LLVMTypeRef arg_types[8];
+   LLVMTypeRef arg_types[7];
    LLVMBasicBlockRef block;
    LLVMBuilderRef builder;
    int64_t t0, t1;
@@ -521,7 +521,6 @@ generate_setup_variant(struct llvmpipe_screen *screen,
    arg_types[4] = LLVMPointerType(vec4f_type, 0);	/* a0, aligned */
    arg_types[5] = LLVMPointerType(vec4f_type, 0);	/* dadx, aligned */
    arg_types[6] = LLVMPointerType(vec4f_type, 0);	/* dady, aligned */
-   arg_types[7] = LLVMPointerType(vec4f_type, 0);       /* key, unused */
 
    func_type = LLVMFunctionType(LLVMVoidType(), arg_types, Elements(arg_types), 0);
 
diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.h b/src/gallium/drivers/llvmpipe/lp_state_setup.h
index 2b080fb..b0c81ba 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_setup.h
+++ b/src/gallium/drivers/llvmpipe/lp_state_setup.h
@@ -30,8 +30,7 @@ typedef void (*lp_jit_setup_triangle)( const float (*v0)[4],
 				       boolean front_facing,
 				       float (*a0)[4],
 				       float (*dadx)[4],
-				       float (*dady)[4],
-				       const struct lp_setup_variant_key *key );
+				       float (*dady)[4] );
 
 
 




More information about the mesa-commit mailing list