Mesa (master): gallivm: Updated lp_build_const_mask_aos to input number of channels.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Nov 28 19:14:55 UTC 2012
Module: Mesa
Branch: master
Commit: 1d3789bccbbcc814fd7b339e9f5b5631e30d9f0e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d3789bccbbcc814fd7b339e9f5b5631e30d9f0e
Author: James Benton <jbenton at vmware.com>
Date: Wed Jul 11 15:39:53 2012 +0100
gallivm: Updated lp_build_const_mask_aos to input number of channels.
Also updated lp_build_const_mask_aos_swizzled to reflect this.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
---
src/gallium/auxiliary/gallivm/lp_bld_const.c | 29 +++++++++++++---------
src/gallium/auxiliary/gallivm/lp_bld_const.h | 10 ++++---
src/gallium/auxiliary/gallivm/lp_bld_logic.c | 2 +-
src/gallium/auxiliary/gallivm/lp_bld_swizzle.c | 2 +-
src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c | 1 +
src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c | 5 +++-
src/gallium/drivers/llvmpipe/lp_state_setup.c | 2 +-
7 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_const.c b/src/gallium/auxiliary/gallivm/lp_bld_const.c
index 24ed23a..0f5a8f8 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_const.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_const.c
@@ -394,7 +394,8 @@ lp_build_const_aos(struct gallivm_state *gallivm,
LLVMValueRef
lp_build_const_mask_aos(struct gallivm_state *gallivm,
struct lp_type type,
- unsigned mask)
+ unsigned mask,
+ unsigned channels)
{
LLVMTypeRef elem_type = LLVMIntTypeInContext(gallivm->context, type.width);
LLVMValueRef masks[LP_MAX_VECTOR_LENGTH];
@@ -402,8 +403,8 @@ lp_build_const_mask_aos(struct gallivm_state *gallivm,
assert(type.length <= LP_MAX_VECTOR_LENGTH);
- for (j = 0; j < type.length; j += 4) {
- for( i = 0; i < 4; ++i) {
+ for (j = 0; j < type.length; j += channels) {
+ for( i = 0; i < channels; ++i) {
masks[j + i] = LLVMConstInt(elem_type,
mask & (1 << i) ? ~0ULL : 0,
1);
@@ -419,17 +420,21 @@ lp_build_const_mask_aos(struct gallivm_state *gallivm,
*/
LLVMValueRef
lp_build_const_mask_aos_swizzled(struct gallivm_state *gallivm,
- struct lp_type type,
- unsigned mask,
- const unsigned char *swizzle)
+ struct lp_type type,
+ unsigned mask,
+ unsigned channels,
+ const unsigned char *swizzle)
{
- mask =
- ((mask & (1 << swizzle[0])) >> swizzle[0])
- | (((mask & (1 << swizzle[1])) >> swizzle[1]) << 1)
- | (((mask & (1 << swizzle[2])) >> swizzle[2]) << 2)
- | (((mask & (1 << swizzle[3])) >> swizzle[3]) << 3);
+ unsigned i, mask_swizzled;
+ mask_swizzled = 0;
+
+ for (i = 0; i < channels; ++i) {
+ if (swizzle[i] < 4) {
+ mask_swizzled |= ((mask & (1 << swizzle[i])) >> swizzle[i]) << i;
+ }
+ }
- return lp_build_const_mask_aos(gallivm, type, mask);
+ return lp_build_const_mask_aos(gallivm, type, mask_swizzled, channels);
}
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_const.h b/src/gallium/auxiliary/gallivm/lp_bld_const.h
index 2205616..b17c419 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_const.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_const.h
@@ -108,14 +108,16 @@ lp_build_const_aos(struct gallivm_state *gallivm, struct lp_type type,
LLVMValueRef
lp_build_const_mask_aos(struct gallivm_state *gallivm,
struct lp_type type,
- unsigned mask);
+ unsigned mask,
+ unsigned channels);
LLVMValueRef
lp_build_const_mask_aos_swizzled(struct gallivm_state *gallivm,
- struct lp_type type,
- unsigned mask,
- const unsigned char *swizzle);
+ struct lp_type type,
+ unsigned mask,
+ unsigned channels,
+ const unsigned char *swizzle);
static INLINE LLVMValueRef
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_logic.c b/src/gallium/auxiliary/gallivm/lp_bld_logic.c
index 7a4a5bb..8a77a43 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_logic.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_logic.c
@@ -603,7 +603,7 @@ lp_build_select_aos(struct lp_build_context *bld,
return LLVMBuildShuffleVector(builder, a, b, LLVMConstVector(shuffles, n), "");
}
else {
- LLVMValueRef mask_vec = lp_build_const_mask_aos(bld->gallivm, type, mask);
+ LLVMValueRef mask_vec = lp_build_const_mask_aos(bld->gallivm, type, mask, 4);
return lp_build_select(bld, mask_vec, a, b);
}
}
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
index 3d70252..4ae4f37 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
@@ -210,7 +210,7 @@ lp_build_swizzle_scalar_aos(struct lp_build_context *bld,
a = LLVMBuildAnd(builder, a,
lp_build_const_mask_aos(bld->gallivm,
- type, 1 << channel), "");
+ type, 1 << channel, 4), "");
/*
* Build a type where each element is an integer that cover the four
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
index 625aac2..44f684a 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c
@@ -329,6 +329,7 @@ lp_emit_store_aos(
writemask = lp_build_const_mask_aos_swizzled(bld->bld_base.base.gallivm,
bld->bld_base.base.type,
reg->Register.WriteMask,
+ TGSI_NUM_CHANNELS,
bld->swizzles);
if (mask) {
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c b/src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c
index 66df662..c615c2d 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_blend_aos.c
@@ -267,12 +267,15 @@ lp_build_blend_aos(struct gallivm_state *gallivm,
const unsigned char swizzle[4])
{
const struct pipe_rt_blend_state * state = &blend->rt[rt];
+ const struct util_format_description * desc;
struct lp_build_blend_aos_context bld;
LLVMValueRef src_factor, dst_factor;
LLVMValueRef result;
unsigned alpha_swizzle = swizzle[3];
boolean fullcolormask;
+ desc = util_format_description(cbuf_format[rt]);
+
/* Setup build context */
memset(&bld, 0, sizeof bld);
lp_build_context_init(&bld.base, gallivm, type);
@@ -333,7 +336,7 @@ lp_build_blend_aos(struct gallivm_state *gallivm,
if (!fullcolormask) {
LLVMValueRef color_mask;
- color_mask = lp_build_const_mask_aos_swizzled(gallivm, bld.base.type, state->colormask, swizzle);
+ color_mask = lp_build_const_mask_aos_swizzled(gallivm, bld.base.type, state.colormask, desc->nr_channels, swizzle);
lp_build_name(color_mask, "color_mask");
/* Combine with input mask if necessary */
diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.c b/src/gallium/drivers/llvmpipe/lp_state_setup.c
index 469a459..f44eed4 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_setup.c
@@ -472,7 +472,7 @@ emit_apply_cyl_wrap(struct gallivm_state *gallivm,
/* Constants */
pos_half = lp_build_const_vec(gallivm, type, +0.5f);
neg_half = lp_build_const_vec(gallivm, type, -0.5f);
- cyl_mask = lp_build_const_mask_aos(gallivm, type, cyl_wrap);
+ cyl_mask = lp_build_const_mask_aos(gallivm, type, cyl_wrap, 4);
one = lp_build_const_vec(gallivm, type, 1.0f);
one = LLVMBuildBitCast(builder, one, lp_build_int_vec_type(gallivm, type), "");
More information about the mesa-commit
mailing list