fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-08 01:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

llvmpipe: make texture border_color dynamic state

Browse source
This commit is contained in:
Brian Paul 2010-09-23 19:16:33 -06:00
parent 61b7da074e
commit d1a4dd4217
7 changed files with 63 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/auxiliary/gallivm/lp_bld_sample.c
View file

@ -114,11 +114,6 @@ lp_sampler_static_state(struct lp_sampler_static_state *state,
state->normalized_coords = sampler->normalized_coords;
state->border_color[0] = sampler->border_color[0];
state->border_color[1] = sampler->border_color[1];
state->border_color[2] = sampler->border_color[2];
state->border_color[3] = sampler->border_color[3];
/*
* FIXME: Handle the remainder of pipe_sampler_view.
*/

9
src/gallium/auxiliary/gallivm/lp_bld_sample.h
View file

@ -82,7 +82,6 @@ struct lp_sampler_static_state
unsigned compare_mode:1;
unsigned compare_func:3;
unsigned normalized_coords:1;
float border_color[4];
unsigned min_max_lod_equal:1; /**< min_lod == max_lod ? */
float min_max_lod; /**< only valid when min_max_lod_equal=1 */
@ -158,6 +157,11 @@ struct lp_sampler_dynamic_state
LLVMValueRef
(*lod_bias)(const struct lp_sampler_dynamic_state *state,
LLVMBuilderRef builder, unsigned unit);
/** Obtain texture border color */
LLVMValueRef
(*border_color)(const struct lp_sampler_dynamic_state *state,
LLVMBuilderRef builder, unsigned unit);
};
@ -178,6 +182,9 @@ struct lp_build_sample_context
struct lp_type float_type;
struct lp_build_context float_bld;
/** float vector type */
struct lp_build_context float_vec_bld;
/** regular scalar float type */
struct lp_type int_type;
struct lp_build_context int_bld;

64
src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
View file

@ -54,6 +54,7 @@
#include "lp_bld_format.h"
#include "lp_bld_sample.h"
#include "lp_bld_sample_aos.h"
#include "lp_bld_struct.h"
#include "lp_bld_quad.h"
@ -93,6 +94,7 @@ wrap_mode_uses_border_color(unsigned mode)
*/
static void
lp_build_sample_texel_soa(struct lp_build_sample_context *bld,
unsigned unit,
LLVMValueRef width,
LLVMValueRef height,
LLVMValueRef depth,
@ -188,13 +190,18 @@ lp_build_sample_texel_soa(struct lp_build_sample_context *bld,
if (use_border) {
/* select texel color or border color depending on use_border */
LLVMValueRef border_color_ptr =
bld->dynamic_state->border_color(bld->dynamic_state,
bld->builder, unit);
int chan;
for (chan = 0; chan < 4; chan++) {
LLVMValueRef border_chan =
lp_build_const_vec(bld->texel_type,
bld->static_state->border_color[chan]);
lp_build_array_get(bld->builder, border_color_ptr,
lp_build_const_int32(chan));
LLVMValueRef border_chan_vec =
lp_build_broadcast_scalar(&bld->float_vec_bld, border_chan);
texel_out[chan] = lp_build_select(&bld->texel_bld, use_border,
border_chan, texel_out[chan]);
border_chan_vec, texel_out[chan]);
}
}
}
@ -567,6 +574,7 @@ lp_build_sample_wrap_nearest(struct lp_build_sample_context *bld,
*/
static void
lp_build_sample_image_nearest(struct lp_build_sample_context *bld,
unsigned unit,
LLVMValueRef width_vec,
LLVMValueRef height_vec,
LLVMValueRef depth_vec,
@ -615,7 +623,8 @@ lp_build_sample_image_nearest(struct lp_build_sample_context *bld,
/*
* Get texture colors.
*/
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x, y, z,
row_stride_vec, img_stride_vec,
data_ptr, colors_out);
@ -628,6 +637,7 @@ lp_build_sample_image_nearest(struct lp_build_sample_context *bld,
*/
static void
lp_build_sample_image_linear(struct lp_build_sample_context *bld,
unsigned unit,
LLVMValueRef width_vec,
LLVMValueRef height_vec,
LLVMValueRef depth_vec,
@ -689,11 +699,13 @@ lp_build_sample_image_linear(struct lp_build_sample_context *bld,
* Get texture colors.
*/
/* get x0/x1 texels */
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x0, y0, z0,
row_stride_vec, img_stride_vec,
data_ptr, neighbors[0][0]);
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x1, y0, z0,
row_stride_vec, img_stride_vec,
data_ptr, neighbors[0][1]);
@ -711,11 +723,13 @@ lp_build_sample_image_linear(struct lp_build_sample_context *bld,
LLVMValueRef colors0[4];
/* get x0/x1 texels at y1 */
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x0, y1, z0,
row_stride_vec, img_stride_vec,
data_ptr, neighbors[1][0]);
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x1, y1, z0,
row_stride_vec, img_stride_vec,
data_ptr, neighbors[1][1]);
@ -735,19 +749,23 @@ lp_build_sample_image_linear(struct lp_build_sample_context *bld,
LLVMValueRef colors1[4];
/* get x0/x1/y0/y1 texels at z1 */
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x0, y0, z1,
row_stride_vec, img_stride_vec,
data_ptr, neighbors1[0][0]);
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x1, y0, z1,
row_stride_vec, img_stride_vec,
data_ptr, neighbors1[0][1]);
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x0, y1, z1,
row_stride_vec, img_stride_vec,
data_ptr, neighbors1[1][0]);
lp_build_sample_texel_soa(bld, width_vec, height_vec, depth_vec,
lp_build_sample_texel_soa(bld, unit,
width_vec, height_vec, depth_vec,
x1, y1, z1,
row_stride_vec, img_stride_vec,
data_ptr, neighbors1[1][1]);
@ -787,6 +805,7 @@ lp_build_sample_image_linear(struct lp_build_sample_context *bld,
*/
static void
lp_build_sample_mipmap(struct lp_build_sample_context *bld,
unsigned unit,
unsigned img_filter,
unsigned mip_filter,
LLVMValueRef s,
@ -812,14 +831,14 @@ lp_build_sample_mipmap(struct lp_build_sample_context *bld,
if (img_filter == PIPE_TEX_FILTER_NEAREST) {
/* sample the first mipmap level */
lp_build_sample_image_nearest(bld,
lp_build_sample_image_nearest(bld, unit,
width0_vec, height0_vec, depth0_vec,
row_stride0_vec, img_stride0_vec,
data_ptr0, s, t, r, colors0);
if (mip_filter == PIPE_TEX_MIPFILTER_LINEAR) {
/* sample the second mipmap level */
lp_build_sample_image_nearest(bld,
lp_build_sample_image_nearest(bld, unit,
width1_vec, height1_vec, depth1_vec,
row_stride1_vec, img_stride1_vec,
data_ptr1, s, t, r, colors1);
@ -829,14 +848,14 @@ lp_build_sample_mipmap(struct lp_build_sample_context *bld,
assert(img_filter == PIPE_TEX_FILTER_LINEAR);
/* sample the first mipmap level */
lp_build_sample_image_linear(bld,
lp_build_sample_image_linear(bld, unit,
width0_vec, height0_vec, depth0_vec,
row_stride0_vec, img_stride0_vec,
data_ptr0, s, t, r, colors0);
if (mip_filter == PIPE_TEX_MIPFILTER_LINEAR) {
/* sample the second mipmap level */
lp_build_sample_image_linear(bld,
lp_build_sample_image_linear(bld, unit,
width1_vec, height1_vec, depth1_vec,
row_stride1_vec, img_stride1_vec,
data_ptr1, s, t, r, colors1);
@ -995,7 +1014,8 @@ lp_build_sample_general(struct lp_build_sample_context *bld,
*/
if (min_filter == mag_filter) {
/* no need to distinquish between minification and magnification */
lp_build_sample_mipmap(bld, min_filter, mip_filter, s, t, r, lod_fpart,
lp_build_sample_mipmap(bld, unit,
min_filter, mip_filter, s, t, r, lod_fpart,
width0_vec, width1_vec,
height0_vec, height1_vec,
depth0_vec, depth1_vec,
@ -1027,7 +1047,8 @@ lp_build_sample_general(struct lp_build_sample_context *bld,
lp_build_if(&if_ctx, flow_ctx, bld->builder, minify);
{
/* Use the minification filter */
lp_build_sample_mipmap(bld, min_filter, mip_filter,
lp_build_sample_mipmap(bld, unit,
min_filter, mip_filter,
s, t, r, lod_fpart,
width0_vec, width1_vec,
height0_vec, height1_vec,
@ -1040,7 +1061,8 @@ lp_build_sample_general(struct lp_build_sample_context *bld,
lp_build_else(&if_ctx);
{
/* Use the magnification filter */
lp_build_sample_mipmap(bld, mag_filter, mip_filter,
lp_build_sample_mipmap(bld, unit,
mag_filter, mip_filter,
s, t, r, lod_fpart,
width0_vec, width1_vec,
height0_vec, height1_vec,
@ -1146,6 +1168,7 @@ lp_build_sample_soa(LLVMBuilderRef builder,
LLVMValueRef s;
LLVMValueRef t;
LLVMValueRef r;
struct lp_type float_vec_type;
if (0) {
enum pipe_format fmt = static_state->format;
@ -1168,7 +1191,10 @@ lp_build_sample_soa(LLVMBuilderRef builder,
bld.int_coord_type = lp_int_type(type);
bld.texel_type = type;
float_vec_type = lp_type_float_vec(32);
lp_build_context_init(&bld.float_bld, builder, bld.float_type);
lp_build_context_init(&bld.float_vec_bld, builder, float_vec_type);
lp_build_context_init(&bld.int_bld, builder, bld.int_type);
lp_build_context_init(&bld.coord_bld, builder, bld.coord_type);
lp_build_context_init(&bld.uint_coord_bld, builder, bld.uint_coord_type);

7
src/gallium/drivers/llvmpipe/lp_jit.c
View file

@ -64,11 +64,11 @@ lp_jit_init_globals(struct llvmpipe_screen *screen)
elem_types[LP_JIT_TEXTURE_DATA] =
LLVMArrayType(LLVMPointerType(LLVMInt8Type(), 0),
LP_MAX_TEXTURE_LEVELS);
elem_types[LP_JIT_TEXTURE_MIN_LOD] = LLVMFloatType();
elem_types[LP_JIT_TEXTURE_MAX_LOD] = LLVMFloatType();
elem_types[LP_JIT_TEXTURE_LOD_BIAS] = LLVMFloatType();
elem_types[LP_JIT_TEXTURE_BORDER_COLOR] =
LLVMArrayType(LLVMFloatType(), 4);
texture_type = LLVMStructType(elem_types, Elements(elem_types), 0);
@ -102,6 +102,9 @@ lp_jit_init_globals(struct llvmpipe_screen *screen)
LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, lod_bias,
screen->target, texture_type,
LP_JIT_TEXTURE_LOD_BIAS);
LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, border_color,
screen->target, texture_type,
LP_JIT_TEXTURE_BORDER_COLOR);
LP_CHECK_STRUCT_SIZE(struct lp_jit_texture,
screen->target, texture_type);

2
src/gallium/drivers/llvmpipe/lp_jit.h
View file

@ -58,6 +58,7 @@ struct lp_jit_texture
float min_lod;
float max_lod;
float lod_bias;
float border_color[4];
};
@ -72,6 +73,7 @@ enum {
LP_JIT_TEXTURE_MIN_LOD,
LP_JIT_TEXTURE_MAX_LOD,
LP_JIT_TEXTURE_LOD_BIAS,
LP_JIT_TEXTURE_BORDER_COLOR,
LP_JIT_TEXTURE_NUM_FIELDS /* number of fields above */
};

1
src/gallium/drivers/llvmpipe/lp_setup.c
View file

@ -643,6 +643,7 @@ lp_setup_set_fragment_sampler_views(struct lp_setup_context *setup,
jit_tex->min_lod = samplers[i]->min_lod;
jit_tex->max_lod = samplers[i]->max_lod;
jit_tex->lod_bias = samplers[i]->lod_bias;
COPY_4V(jit_tex->border_color, samplers[i]->border_color);
/* We're referencing the texture's internal data, so save a
* reference to it.

2
src/gallium/drivers/llvmpipe/lp_tex_sample.c
View file

@ -154,6 +154,7 @@ LP_LLVM_TEXTURE_MEMBER(data_ptr, LP_JIT_TEXTURE_DATA, FALSE)
LP_LLVM_TEXTURE_MEMBER(min_lod, LP_JIT_TEXTURE_MIN_LOD, TRUE)
LP_LLVM_TEXTURE_MEMBER(max_lod, LP_JIT_TEXTURE_MAX_LOD, TRUE)
LP_LLVM_TEXTURE_MEMBER(lod_bias, LP_JIT_TEXTURE_LOD_BIAS, TRUE)
LP_LLVM_TEXTURE_MEMBER(border_color, LP_JIT_TEXTURE_BORDER_COLOR, FALSE)
static void
@ -223,6 +224,7 @@ lp_llvm_sampler_soa_create(const struct lp_sampler_static_state *static_state,
sampler->dynamic_state.base.min_lod = lp_llvm_texture_min_lod;
sampler->dynamic_state.base.max_lod = lp_llvm_texture_max_lod;
sampler->dynamic_state.base.lod_bias = lp_llvm_texture_lod_bias;
sampler->dynamic_state.base.border_color = lp_llvm_texture_border_color;
sampler->dynamic_state.static_state = static_state;
sampler->dynamic_state.context_ptr = context_ptr;