diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-09-03 10:54:41 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-09-11 13:27:27 +0100 |
| commit | 225530f1f222152754521eb4708d6352cd179656 (patch) | |
| tree | 873da925256c104ce82e3046af765acdb8039659 /src/gallium/auxiliary/gallivm | |
| parent | 775edbfaa1ab0077fd60e1e5283081279763d0d8 (diff) | |
gallivm: Cleanup the TGSI <-> sampler interface.
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi.h | 8 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h index bc9140852f..2a05cbc3e2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h @@ -84,13 +84,9 @@ struct lp_build_sampler_soa struct lp_build_sampler_aos { - void - (*destroy)( struct lp_build_sampler_aos *sampler ); - LLVMValueRef - (*emit_fetch_texel)( const struct lp_build_sampler_aos *sampler, - LLVMBuilderRef builder, - struct lp_type type, + (*emit_fetch_texel)( struct lp_build_sampler_aos *sampler, + struct lp_build_context *bld, unsigned target, /* TGSI_TEXTURE_* */ unsigned unit, LLVMValueRef coords, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c index 2793a1a397..6bf510cbef 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c @@ -74,7 +74,7 @@ struct lp_build_tgsi_aos_context const LLVMValueRef *inputs; LLVMValueRef *outputs; - const struct lp_build_sampler_aos *sampler; + struct lp_build_sampler_aos *sampler; LLVMValueRef immediates[LP_MAX_TGSI_IMMEDIATES]; LLVMValueRef temps[LP_MAX_TGSI_TEMPS]; @@ -398,8 +398,7 @@ emit_tex(struct lp_build_tgsi_aos_context *bld, } return bld->sampler->emit_fetch_texel(bld->sampler, - bld->base.builder, - bld->base.type, + &bld->base, target, unit, coords, ddx, ddy, modifier); |