diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_setup.c | 20 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_setup.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_surface.c | 2 |
3 files changed, 24 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.c b/src/gallium/drivers/llvmpipe/lp_state_setup.c index ed68b984a92..bb5cfc4be46 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_state_setup.c @@ -244,6 +244,7 @@ lp_do_offset_tri(struct gallivm_state *gallivm, { LLVMBuilderRef b = gallivm->builder; struct lp_build_context bld; + struct lp_build_context flt_scalar_bld; LLVMValueRef zoffset, mult; LLVMValueRef z0_new, z1_new, z2_new; LLVMValueRef dzdxdzdy, dzdx, dzdy, dzxyz20, dyzzx01, dyzzx01_dzxyz20, dzx01_dyz20; @@ -298,6 +299,18 @@ lp_do_offset_tri(struct gallivm_state *gallivm, lp_build_const_float(gallivm, key->pgon_offset_units), mult, "zoffset"); + lp_build_context_init(&flt_scalar_bld, gallivm, lp_type_float_vec(32, 32)); + if (key->pgon_offset_clamp > 0) { + zoffset = lp_build_min(&flt_scalar_bld, + lp_build_const_float(gallivm, key->pgon_offset_clamp), + zoffset); + } + else if (key->pgon_offset_clamp < 0) { + zoffset = lp_build_max(&flt_scalar_bld, + lp_build_const_float(gallivm, key->pgon_offset_clamp), + zoffset); + } + /* yuck */ shuffles[0] = twoi; shuffles[1] = lp_build_const_int32(gallivm, 6); @@ -312,6 +325,10 @@ lp_do_offset_tri(struct gallivm_state *gallivm, zoffset = vec4f_from_scalar(gallivm, zoffset, ""); /* clamp and do offset */ + /* + * FIXME I suspect the clamp (is that even right to always clamp to fixed + * 0.0/1.0?) should really be per fragment? + */ z0z1z2 = lp_build_clamp(&bld, LLVMBuildFAdd(b, z0z1z2, zoffset, ""), bld.zero, bld.one); /* insert into args->a0.z, a1.z, a2.z: @@ -810,7 +827,7 @@ lp_make_setup_variant_key(struct llvmpipe_context *lp, key->pixel_center_half = lp->rasterizer->half_pixel_center; key->twoside = lp->rasterizer->light_twoside; key->size = Offset(struct lp_setup_variant_key, - inputs[key->num_inputs]); + inputs[key->num_inputs]); key->color_slot = lp->color_slot [0]; key->bcolor_slot = lp->bcolor_slot[0]; @@ -823,6 +840,7 @@ lp_make_setup_variant_key(struct llvmpipe_context *lp, key->pgon_offset_units = (float) (lp->rasterizer->offset_units * lp->mrd); key->pgon_offset_scale = lp->rasterizer->offset_scale; + key->pgon_offset_clamp = lp->rasterizer->offset_clamp; key->pad = 0; memcpy(key->inputs, fs->inputs, key->num_inputs * sizeof key->inputs[0]); for (i = 0; i < key->num_inputs; i++) { diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.h b/src/gallium/drivers/llvmpipe/lp_state_setup.h index 73d40a59f29..f49e575aa1f 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_setup.h +++ b/src/gallium/drivers/llvmpipe/lp_state_setup.h @@ -14,7 +14,7 @@ struct lp_setup_variant_list_item }; -struct lp_setup_variant_key { +struct lp_setup_variant_key { unsigned size:16; unsigned num_inputs:8; int color_slot:8; @@ -27,8 +27,10 @@ struct lp_setup_variant_key { unsigned twoside:1; unsigned pad:5; + /* TODO: get those floats out of the key and use a jit_context for setup */ float pgon_offset_units; float pgon_offset_scale; + float pgon_offset_clamp; struct lp_shader_input inputs[PIPE_MAX_SHADER_INPUTS]; }; diff --git a/src/gallium/drivers/llvmpipe/lp_state_surface.c b/src/gallium/drivers/llvmpipe/lp_state_surface.c index 375ceb2b942..e6aac319447 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_surface.c +++ b/src/gallium/drivers/llvmpipe/lp_state_surface.c @@ -65,6 +65,8 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe, } /* Tell draw module how deep the Z/depth buffer is */ + /* FIXME: mrd constant isn't right should use a value derived from + * current primitive not a constant (for float depth buffers) */ if (lp->framebuffer.zsbuf) { int depth_bits; double mrd; |