Mesa (master): llvmpipe: Merge lp_build_load_rgba_soa into lp_build_sample_texel.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Oct 25 09:55:37 UTC 2009
Module: Mesa
Branch: master
Commit: a55b305c5b3be3fed8112d44878e712cf09303ce
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a55b305c5b3be3fed8112d44878e712cf09303ce
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Oct 22 22:44:32 2009 +0100
llvmpipe: Merge lp_build_load_rgba_soa into lp_build_sample_texel.
---
src/gallium/drivers/llvmpipe/lp_bld_sample_soa.c | 48 +++++++--------------
1 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_sample_soa.c b/src/gallium/drivers/llvmpipe/lp_bld_sample_soa.c
index 6aa7ad4..a7d2118 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_sample_soa.c
+++ b/src/gallium/drivers/llvmpipe/lp_bld_sample_soa.c
@@ -76,28 +76,6 @@ struct lp_build_sample_context
static void
-lp_build_load_rgba_soa(LLVMBuilderRef builder,
- const struct util_format_description *format_desc,
- struct lp_type type,
- LLVMValueRef base_ptr,
- LLVMValueRef offsets,
- LLVMValueRef *rgba)
-{
- LLVMValueRef packed;
-
- assert(format_desc->block.width == 1);
- assert(format_desc->block.height == 1);
- assert(format_desc->block.bits <= type.width);
-
- packed = lp_build_gather(builder,
- type.length, format_desc->block.bits, type.width,
- base_ptr, offsets);
-
- lp_build_unpack_rgba_soa(builder, format_desc, type, packed, rgba);
-}
-
-
-static void
lp_build_sample_texel(struct lp_build_sample_context *bld,
LLVMValueRef x,
LLVMValueRef y,
@@ -105,22 +83,28 @@ lp_build_sample_texel(struct lp_build_sample_context *bld,
LLVMValueRef data_ptr,
LLVMValueRef *texel)
{
- struct lp_build_context *int_coord_bld = &bld->int_coord_bld;
LLVMValueRef offset;
+ LLVMValueRef packed;
offset = lp_build_sample_offset(&bld->int_coord_bld,
bld->format_desc,
- x,
- y,
- y_stride,
+ x, y, y_stride,
data_ptr);
- lp_build_load_rgba_soa(bld->builder,
- bld->format_desc,
- bld->texel_type,
- data_ptr,
- offset,
- texel);
+ assert(bld->format_desc->block.width == 1);
+ assert(bld->format_desc->block.height == 1);
+ assert(bld->format_desc->block.bits <= bld->texel_type.width);
+
+ packed = lp_build_gather(bld->builder,
+ bld->texel_type.length,
+ bld->format_desc->block.bits,
+ bld->texel_type.width,
+ data_ptr, offset);
+
+ lp_build_unpack_rgba_soa(bld->builder,
+ bld->format_desc,
+ bld->texel_type,
+ packed, texel);
}
More information about the mesa-commit
mailing list