Mesa (master): gallivm: Cleanup the TGSI <-> sampler interface.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sat Sep 11 12:47:46 UTC 2010
Module: Mesa
Branch: master
Commit: 225530f1f222152754521eb4708d6352cd179656
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=225530f1f222152754521eb4708d6352cd179656
Author: José Fonseca <jfonseca at vmware.com>
Date: Fri Sep 3 10:54:41 2010 +0100
gallivm: Cleanup the TGSI <-> sampler interface.
---
src/gallium/auxiliary/gallivm/lp_bld_tgsi.h | 8 ++------
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 bc91408..2a05cbc 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 2793a1a..6bf510c 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);
More information about the mesa-commit
mailing list